htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update puma

Browse Source
This commit is contained in:
Jan Renz
2015-11-23 19:47:13 +01:00
parent 62046cc9ec
commit d262e194c1
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -19,7 +19,7 @@ gem 'kramdown'
gem 'newrelic_rpm' gem 'newrelic_rpm'
gem 'pg', platform: :ruby gem 'pg', platform: :ruby
gem 'pry' gem 'pry'
gem 'puma' gem 'puma', '~> 2.15.3'
gem 'pundit' gem 'pundit'
gem 'rails', '~> 4.1.2' gem 'rails', '~> 4.1.2'
gem 'rails-i18n', '~> 4.0.0' gem 'rails-i18n', '~> 4.0.0'

10
Gemfile.lock
View File

@ -185,13 +185,11 @@ GEM
method_source (~> 0.8.1) method_source (~> 0.8.1)
slop (~> 3.4) slop (~> 3.4)
spoon (~> 0.0) spoon (~> 0.0)
puma (2.11.1) puma (2.15.3)
rack (>= 1.1, < 2.0) puma (2.15.3-java)
puma (2.11.1-java)
rack (>= 1.1, < 2.0)
pundit (0.3.0) pundit (0.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
rack (1.5.2) rack (1.5.5)
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.10) rails (4.1.10)
@ -368,7 +366,7 @@ DEPENDENCIES
nyan-cat-formatter nyan-cat-formatter
pg pg
pry pry
puma puma (~> 2.15.3)
pundit pundit
rails (~> 4.1.2) rails (~> 4.1.2)
rails-i18n (~> 4.0.0) rails-i18n (~> 4.0.0)