about summary refs log tree commit diff
path: root/Gemfile
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-21 19:09:59 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-21 19:09:59 +0100
commitc128fcee1605118a1e1268b0c1c4e4e575584f61 (patch)
tree77eca5c30a0a4ba4005f3f32f0d9db899a4d040b /Gemfile
parent318e63cb7910df90bb3e99bc5a3547ee01426f22 (diff)
Update Rails to 5.0.1
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index db6cb7f44..6bf95ec5e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-gem 'rails', git: 'https://github.com/rails/rails.git', branch: '5-0-stable'
+gem 'rails', '~> 5.0.1.0'
 gem 'sass-rails', '~> 5.0'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.1.0'
@@ -41,7 +41,6 @@ gem 'simple_form'
 gem 'will_paginate'
 gem 'rack-attack'
 gem 'rack-cors', require: 'rack/cors'
-gem 'rack-timeout-puma'
 gem 'sidekiq'
 gem 'ledermann-rails-settings'
 gem 'pg_search'
@@ -78,4 +77,5 @@ group :production do
   gem 'rails_12factor'
   gem 'lograge'
   gem 'redis-rails'
+  gem 'rack-timeout-puma'
 end