diff --git a/Gemfile b/Gemfile index b3aa24712..b6dfd8fb1 100644 --- a/Gemfile +++ b/Gemfile @@ -71,11 +71,11 @@ gem 'seed-fu', '~> 2.3.3' if rails_master? gem 'rails', git: 'https://github.com/rails/rails.git' - gem 'actionpack-action_caching', git: 'https://github.com/rails/actionpack-action_caching.git' else gem 'rails' - gem 'actionpack-action_caching' end + +gem 'actionpack-action_caching' gem 'rails-observers' # Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`. diff --git a/Gemfile_master.lock b/Gemfile_master.lock index 2ae98fe1c..c0e27f439 100644 --- a/Gemfile_master.lock +++ b/Gemfile_master.lock @@ -1,10 +1,3 @@ -GIT - remote: https://github.com/rails/actionpack-action_caching.git - revision: a9f3f09477b12b51faa6756005eee4103f7f4030 - specs: - actionpack-action_caching (1.1.0) - actionpack (>= 4.0.0, < 5.0) - GIT remote: https://github.com/rails/rails.git revision: aa6637d140c2ebd28bbd23fc250af033a065dbe8 @@ -79,6 +72,8 @@ PATH GEM remote: https://rubygems.org/ specs: + actionpack-action_caching (1.1.1) + actionpack (>= 4.0.0, < 5.0) active_model_serializers (0.8.2) activemodel (>= 3.0) addressable (2.3.6) @@ -441,7 +436,7 @@ PLATFORMS ruby DEPENDENCIES - actionpack-action_caching! + actionpack-action_caching active_model_serializers (~> 0.8.0) annotate barber