From 6958ed2ff5e24c69673c71f871445dc6c542c46c Mon Sep 17 00:00:00 2001
From: Cyril Mougel <cyril.mougel@gmail.com>
Date: Tue, 24 Sep 2013 17:26:39 +0200
Subject: [PATCH] Avoid diff between ruby_19 and ruby_18 in Gemfile.

---
 Gemfile      |  9 ++++-----
 Gemfile.lock | 12 +++---------
 Procfile     |  1 +
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index abfa525..32c5305 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,6 @@ gem 'rack-ssl', :require => 'rack/ssl'   # force SSL
 gem 'useragent'
 gem 'decent_exposure'
 gem 'strong_parameters'
-gem 'SystemTimer', :platform => :ruby_18
 gem 'actionmailer_inline_css'
 gem 'kaminari', '>= 0.14.1'
 gem 'rack-ssl-enforcer', :require => false
@@ -93,13 +92,13 @@ group :development do
   gem 'capistrano'
 
   # better errors
-  gem 'better_errors'    , :platform => :ruby_19
-  gem 'binding_of_caller', :platform => :ruby_19
-  gem 'meta_request'     , :platform => :ruby_19
+  gem 'better_errors'
+  gem 'binding_of_caller'
+  gem 'meta_request'
   gem 'foreman'
 
   # Use thin for development
-  gem 'thin', :group => :development, :platform => :ruby
+  gem 'puma'
 
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0da072d..7a2335c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,6 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    SystemTimer (1.2.3)
     actionmailer (3.2.13)
       actionpack (= 3.2.13)
       mail (~> 2.5.3)
@@ -90,7 +89,6 @@ GEM
       safe_yaml (~> 0.9.0)
     css_parser (1.3.4)
       addressable
-    daemons (1.1.9)
     database_cleaner (0.9.1)
     debug_inspector (0.0.2)
     debugger (1.6.1)
@@ -111,7 +109,6 @@ GEM
       launchy (~> 2.1)
       mail (~> 2.2)
     erubis (2.7.0)
-    eventmachine (1.0.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
     fabrication (1.3.2)
@@ -254,6 +251,8 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
+    puma (2.6.0)
+      rack (>= 1.1, < 2.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
     rack (1.4.5)
@@ -349,10 +348,6 @@ GEM
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
     timecop (0.6.1)
@@ -387,7 +382,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  SystemTimer
   actionmailer_inline_css
   airbrake
   better_errors
@@ -428,6 +422,7 @@ DEPENDENCIES
   pivotal-tracker
   pjax_rails
   pry-rails
+  puma
   quiet_assets
   rack-ssl
   rack-ssl-enforcer
@@ -442,7 +437,6 @@ DEPENDENCIES
   taskmapper (~> 0.8.0)
   taskmapper-unfuddle (~> 0.7.0)
   therubyracer
-  thin
   timecop (= 0.6.1)
   turbo-sprockets-rails3
   uglifier (>= 1.0.3)
diff --git a/Procfile b/Procfile
index 9c82374..85a4209 100644
--- a/Procfile
+++ b/Procfile
@@ -1 +1,2 @@
+puma_web: bundle exec puma
 web: bundle exec unicorn -p $PORT -c ./config/unicorn.rb
--
libgit2 0.21.2