Commit 6958ed2ff5e24c69673c71f871445dc6c542c46c
1 parent
9ce0dc76
Exists in
master
and in
1 other branch
Avoid diff between ruby_19 and ruby_18 in Gemfile.
Use Puma instead of Thin like dev webserver
Showing
3 changed files
with
8 additions
and
14 deletions
Show diff stats
Gemfile
| ... | ... | @@ -12,7 +12,6 @@ gem 'rack-ssl', :require => 'rack/ssl' # force SSL |
| 12 | 12 | gem 'useragent' |
| 13 | 13 | gem 'decent_exposure' |
| 14 | 14 | gem 'strong_parameters' |
| 15 | -gem 'SystemTimer', :platform => :ruby_18 | |
| 16 | 15 | gem 'actionmailer_inline_css' |
| 17 | 16 | gem 'kaminari', '>= 0.14.1' |
| 18 | 17 | gem 'rack-ssl-enforcer', :require => false |
| ... | ... | @@ -93,13 +92,13 @@ group :development do |
| 93 | 92 | gem 'capistrano' |
| 94 | 93 | |
| 95 | 94 | # better errors |
| 96 | - gem 'better_errors' , :platform => :ruby_19 | |
| 97 | - gem 'binding_of_caller', :platform => :ruby_19 | |
| 98 | - gem 'meta_request' , :platform => :ruby_19 | |
| 95 | + gem 'better_errors' | |
| 96 | + gem 'binding_of_caller' | |
| 97 | + gem 'meta_request' | |
| 99 | 98 | gem 'foreman' |
| 100 | 99 | |
| 101 | 100 | # Use thin for development |
| 102 | - gem 'thin', :group => :development, :platform => :ruby | |
| 101 | + gem 'puma' | |
| 103 | 102 | |
| 104 | 103 | end |
| 105 | 104 | ... | ... |
Gemfile.lock
| ... | ... | @@ -8,7 +8,6 @@ GIT |
| 8 | 8 | GEM |
| 9 | 9 | remote: http://rubygems.org/ |
| 10 | 10 | specs: |
| 11 | - SystemTimer (1.2.3) | |
| 12 | 11 | actionmailer (3.2.13) |
| 13 | 12 | actionpack (= 3.2.13) |
| 14 | 13 | mail (~> 2.5.3) |
| ... | ... | @@ -90,7 +89,6 @@ GEM |
| 90 | 89 | safe_yaml (~> 0.9.0) |
| 91 | 90 | css_parser (1.3.4) |
| 92 | 91 | addressable |
| 93 | - daemons (1.1.9) | |
| 94 | 92 | database_cleaner (0.9.1) |
| 95 | 93 | debug_inspector (0.0.2) |
| 96 | 94 | debugger (1.6.1) |
| ... | ... | @@ -111,7 +109,6 @@ GEM |
| 111 | 109 | launchy (~> 2.1) |
| 112 | 110 | mail (~> 2.2) |
| 113 | 111 | erubis (2.7.0) |
| 114 | - eventmachine (1.0.3) | |
| 115 | 112 | execjs (1.4.0) |
| 116 | 113 | multi_json (~> 1.0) |
| 117 | 114 | fabrication (1.3.2) |
| ... | ... | @@ -254,6 +251,8 @@ GEM |
| 254 | 251 | slop (~> 3.4) |
| 255 | 252 | pry-rails (0.3.2) |
| 256 | 253 | pry (>= 0.9.10) |
| 254 | + puma (2.6.0) | |
| 255 | + rack (>= 1.1, < 2.0) | |
| 257 | 256 | quiet_assets (1.0.2) |
| 258 | 257 | railties (>= 3.1, < 5.0) |
| 259 | 258 | rack (1.4.5) |
| ... | ... | @@ -349,10 +348,6 @@ GEM |
| 349 | 348 | therubyracer (0.12.0) |
| 350 | 349 | libv8 (~> 3.16.14.0) |
| 351 | 350 | ref |
| 352 | - thin (1.5.1) | |
| 353 | - daemons (>= 1.0.9) | |
| 354 | - eventmachine (>= 0.12.6) | |
| 355 | - rack (>= 1.0.0) | |
| 356 | 351 | thor (0.18.1) |
| 357 | 352 | tilt (1.4.1) |
| 358 | 353 | timecop (0.6.1) |
| ... | ... | @@ -387,7 +382,6 @@ PLATFORMS |
| 387 | 382 | ruby |
| 388 | 383 | |
| 389 | 384 | DEPENDENCIES |
| 390 | - SystemTimer | |
| 391 | 385 | actionmailer_inline_css |
| 392 | 386 | airbrake |
| 393 | 387 | better_errors |
| ... | ... | @@ -428,6 +422,7 @@ DEPENDENCIES |
| 428 | 422 | pivotal-tracker |
| 429 | 423 | pjax_rails |
| 430 | 424 | pry-rails |
| 425 | + puma | |
| 431 | 426 | quiet_assets |
| 432 | 427 | rack-ssl |
| 433 | 428 | rack-ssl-enforcer |
| ... | ... | @@ -442,7 +437,6 @@ DEPENDENCIES |
| 442 | 437 | taskmapper (~> 0.8.0) |
| 443 | 438 | taskmapper-unfuddle (~> 0.7.0) |
| 444 | 439 | therubyracer |
| 445 | - thin | |
| 446 | 440 | timecop (= 0.6.1) |
| 447 | 441 | turbo-sprockets-rails3 |
| 448 | 442 | uglifier (>= 1.0.3) | ... | ... |
Procfile