Skip to content

Commit

Permalink
Merge pull request engineyard#17 from engineyard/puma_windows
Browse files Browse the repository at this point in the history
Moved puma to Ruby group since it's a PITA on Windows
  • Loading branch information
Jason Hansen committed May 28, 2014
2 parents 5ac2e75 + e54734e commit cd5542f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ gem 'jquery-rails', '~> 3.0'
gem 'rails_autolink', '~> 1.1'
gem 'simple_form', '~> 2.1'

gem 'puma', '~> 2.6'


group :assets do
gem 'sass-rails', '~> 3.2'
gem 'coffee-rails', '~> 3.2'
Expand All @@ -28,7 +25,7 @@ platform :ruby do

gem 'newrelic_rpm', '~> 3.6'
gem 'unicorn', '~> 4.7'

gem 'puma', '~> 2.6'
gem 'json', '~> 1.8'
gem 'minitest', '~> 4.7'
gem 'psych', '~> 2.0'
Expand Down

0 comments on commit cd5542f

Please sign in to comment.