From b6bd3c61a07f42f9df6fdccb52608307646f1273 Mon Sep 17 00:00:00 2001 From: yogesh Date: Thu, 6 Feb 2014 16:13:45 +0530 Subject: [PATCH 1/5] Revert "Removed secret token, database.yml and README file" This reverts commit b215f26b6b9f80c786bfbfc2dd04e4a678e767b6. --- .gitignore | 2 -- README.rdoc | 28 ++++++++++++++++++++++++++++ config/database.yml | 25 +++++++++++++++++++++++++ config/initializers/secret_token.rb | 12 ++++++++++++ 4 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 README.rdoc create mode 100644 config/database.yml create mode 100644 config/initializers/secret_token.rb diff --git a/.gitignore b/.gitignore index f151ae9..6a502e9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,3 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp -config/initializers/secret_token.rb -config/database.yml diff --git a/README.rdoc b/README.rdoc new file mode 100644 index 0000000..dd4e97e --- /dev/null +++ b/README.rdoc @@ -0,0 +1,28 @@ +== README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... + + +Please feel free to use a different markup language if you do not plan to run +rake doc:app. diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 0000000..51a4dd4 --- /dev/null +++ b/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb new file mode 100644 index 0000000..aad1281 --- /dev/null +++ b/config/initializers/secret_token.rb @@ -0,0 +1,12 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key is used for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! + +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +# You can use `rake secret` to generate a secure secret key. + +# Make sure your secret_key_base is kept private +# if you're sharing your code publicly. +OfficeAutomation::Application.config.secret_key_base = 'e5d855bcdd751adf600d00d8465bf6c18af6f9ea5585f1590d72601b955140600d5df4a88df834cb609daeca64bce8d11e17149a6c216eab3ffec0e3ef7c1693' From 09120a50dbd47ae8c4a63ef6bff0cd572bf2232f Mon Sep 17 00:00:00 2001 From: yogesh Date: Thu, 6 Feb 2014 16:23:13 +0530 Subject: [PATCH 2/5] therubyracer gem added --- .gitignore | 2 ++ Gemfile | 2 +- Gemfile.lock | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6a502e9..f151ae9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp +config/initializers/secret_token.rb +config/database.yml diff --git a/Gemfile b/Gemfile index 292c232..630e133 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.0.0' # See https://github.com/sstephenson/execjs#readme for more supported runtimes -# gem 'therubyracer', platforms: :ruby +gem 'therubyracer', platforms: :ruby # Use jquery as the JavaScript library gem 'jquery-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 44b3ccd..75c8a5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -46,6 +46,7 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) + libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -72,6 +73,7 @@ GEM rake (10.1.1) rdoc (4.1.1) json (~> 1.4) + ref (1.0.5) sass (3.2.14) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) @@ -90,6 +92,9 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.8) + therubyracer (0.12.0) + libv8 (~> 3.16.14.0) + ref thor (0.18.1) thread_safe (0.1.3) atomic @@ -115,5 +120,6 @@ DEPENDENCIES sass-rails (~> 4.0.0) sdoc sqlite3 + therubyracer turbolinks uglifier (>= 1.3.0) From 02be2168c3cadc6fc03bcf0306fb61d6e864d27c Mon Sep 17 00:00:00 2001 From: yogeshjain999 Date: Thu, 6 Feb 2014 16:37:44 +0530 Subject: [PATCH 3/5] Delete database.yml --- config/database.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 config/database.yml diff --git a/config/database.yml b/config/database.yml deleted file mode 100644 index 51a4dd4..0000000 --- a/config/database.yml +++ /dev/null @@ -1,25 +0,0 @@ -# SQLite version 3.x -# gem install sqlite3 -# -# Ensure the SQLite 3 gem is defined in your Gemfile -# gem 'sqlite3' -development: - adapter: sqlite3 - database: db/development.sqlite3 - pool: 5 - timeout: 5000 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - pool: 5 - timeout: 5000 - -production: - adapter: sqlite3 - database: db/production.sqlite3 - pool: 5 - timeout: 5000 From 54154c0227539c6762e55ee4b2a4c497c467e157 Mon Sep 17 00:00:00 2001 From: yogeshjain999 Date: Thu, 6 Feb 2014 16:38:46 +0530 Subject: [PATCH 4/5] Delete README.rdoc --- README.rdoc | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 README.rdoc diff --git a/README.rdoc b/README.rdoc deleted file mode 100644 index dd4e97e..0000000 --- a/README.rdoc +++ /dev/null @@ -1,28 +0,0 @@ -== README - -This README would normally document whatever steps are necessary to get the -application up and running. - -Things you may want to cover: - -* Ruby version - -* System dependencies - -* Configuration - -* Database creation - -* Database initialization - -* How to run the test suite - -* Services (job queues, cache servers, search engines, etc.) - -* Deployment instructions - -* ... - - -Please feel free to use a different markup language if you do not plan to run -rake doc:app. From 1af7a5273b2917df55dd33cb52b2d7e70529f41b Mon Sep 17 00:00:00 2001 From: yogeshjain999 Date: Thu, 6 Feb 2014 17:04:12 +0530 Subject: [PATCH 5/5] Delete secret_token.rb --- config/initializers/secret_token.rb | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 config/initializers/secret_token.rb diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb deleted file mode 100644 index aad1281..0000000 --- a/config/initializers/secret_token.rb +++ /dev/null @@ -1,12 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key is used for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! - -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -# You can use `rake secret` to generate a secure secret key. - -# Make sure your secret_key_base is kept private -# if you're sharing your code publicly. -OfficeAutomation::Application.config.secret_key_base = 'e5d855bcdd751adf600d00d8465bf6c18af6f9ea5585f1590d72601b955140600d5df4a88df834cb609daeca64bce8d11e17149a6c216eab3ffec0e3ef7c1693'