From 6e25b108d80d14950cd8016f27cdd6caf79d174c Mon Sep 17 00:00:00 2001 From: Matthew Gerrior Date: Wed, 15 Jul 2015 16:20:16 -0400 Subject: [PATCH 1/3] Ignore railsbox folder. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e159582..f808b3b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ dump.rdb .ruby-version .rbenv-version redis_state.rdb +/railsbox From b62efb4c54c0a44dfb9027fad915e404b1996e63 Mon Sep 17 00:00:00 2001 From: Matthew Gerrior Date: Wed, 15 Jul 2015 16:20:27 -0400 Subject: [PATCH 2/3] Switch to Unicorn since Railsbox has no recipe for thin. --- Gemfile | 4 ++-- Gemfile.lock | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 7f53d08..80d5620 100644 --- a/Gemfile +++ b/Gemfile @@ -5,10 +5,10 @@ ruby '2.1.6' gem 'rails', '~> 4.2' # Web -# gem 'unicorn' +gem 'unicorn' # gem 'puma' # gem 'rails_12factor' # required for heroku applications -gem 'thin' +# gem 'thin' # Databases gem 'pg' diff --git a/Gemfile.lock b/Gemfile.lock index cef92c1..2a7ed62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,6 @@ GEM compass-rails (2.0.0) compass (>= 0.12.2) connection_pool (2.2.0) - daemons (1.2.3) devise (3.5.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -248,6 +247,7 @@ GEM kaminari (0.16.3) actionpack (>= 3.0.0) activesupport (>= 3.0.0) + kgio (2.9.3) launchy (2.4.3) addressable (~> 2.3) listen (3.0.2) @@ -321,6 +321,7 @@ GEM activesupport (= 4.2.3) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) + raindrops (0.14.0) rake (10.4.2) rb-fsevent (0.9.5) rb-inotify (0.9.5) @@ -390,10 +391,6 @@ GEM steak (2.0.0) capybara (>= 1.0.0) rspec-rails (>= 2.5.0) - thin (1.6.3) - daemons (~> 1.0, >= 1.0.9) - eventmachine (~> 1.0) - rack (~> 1.0) thor (0.19.1) thread_safe (0.3.5) tilt (1.4.1) @@ -405,6 +402,10 @@ GEM uglifier (2.7.1) execjs (>= 0.3.0) json (>= 1.8.0) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) warden (1.2.3) rack (>= 1.0) whenever (0.9.4) @@ -454,7 +455,10 @@ DEPENDENCIES sinatra smusher steak - thin timecop uglifier (>= 1.3.0) + unicorn whenever + +BUNDLED WITH + 1.10.5 From e10c9acc7329dd6511e9028ea09ff121f356ed03 Mon Sep 17 00:00:00 2001 From: Matthew Gerrior Date: Wed, 15 Jul 2015 16:20:37 -0400 Subject: [PATCH 3/3] Update database schema. --- db/schema.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/db/schema.rb b/db/schema.rb index 9c2bdb6..38d1b52 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -15,6 +15,7 @@ # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" + enable_extension "hstore" create_table "todos", force: :cascade do |t| t.string "title"