diff --git a/Gemfile b/Gemfile index 2906dd9..ca6e42f 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ end source 'https://rubygems.org' do gem 'bundler', '>= 1.8.4' - # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' + # Bundle edge Rails instead: gem 'rails', '~> 4.2.5.1', github: 'rails/rails' gem 'rails', '4.2.5' gem 'puma' diff --git a/Gemfile.lock b/Gemfile.lock index a134c27..0395a05 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM builder (3.2.2) byebug (8.2.2) coderay (1.1.1) - concurrent-ruby (1.0.0) + concurrent-ruby (1.0.1) daemons (1.2.3) dalli (2.7.6) debug_inspector (0.0.2) @@ -198,7 +198,7 @@ GEM sprockets (3.5.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.1) + sprockets-rails (3.0.3) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0)