Updated to Ruby 2.2.3. Swapped out Unicorn for Puma.

emberjs · Aug 21, 2015 · bcfe938 · bcfe938
1 parent 9e1bff0
commit bcfe938
Show file tree

Hide file tree

Showing 14 changed files with 172 additions and 168 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,4 @@
 /log/*.log
 /tmp
 
-config/database.yml
 .env
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.1.2
+2.2.3
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,9 @@
 source 'https://rubygems.org'
-ruby '2.1.2'
+ruby '2.2.3'
 
 gem 'rails', '4.1.2'
+gem 'puma', '~> 2.13.4'
+gem 'rack-timeout', '~> 0.2.4'
 
 gem 'pg'
 
@@ -30,7 +32,6 @@ gem 'zeroclipboard-rails'
 
 group :production do
   gem 'rails_12factor'
-  gem 'unicorn'
 end
 
 group :development do
@@ -42,15 +43,14 @@ group :development do
   gem 'pry'
   gem 'pry-rails'
   gem 'quiet_assets'
-  gem 'thin'
   gem 'rack-mini-profiler'
   gem 'haml-rails'
   gem "spring-commands-rspec", require: false
 end
 
 group :development, :test do
   gem 'capybara', '>= 2.2'
-  gem 'capybara-webkit'
+  gem 'capybara-webkit', '~> 1.6.0' # Requires local installation of QT (`brew install qt`)
   gem 'database_cleaner'
   gem 'dotenv-rails'
   gem 'factory_girl_rails'
@@ -61,4 +61,5 @@ group :development, :test do
   gem 'rspec'
   gem 'rspec-rails'
   gem 'timecop'
+  gem 'spring'
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,5 +4,4 @@ @@
     /log/*.log
     /tmp
-    config/database.yml
     .env