diff --git a/Gemfile b/Gemfile index 94a960ccf0f..3c631b37c89 100644 --- a/Gemfile +++ b/Gemfile @@ -57,15 +57,7 @@ gem 'mail', '~> 2.5.4' gem 'hiredis' gem 'redis', require: ["redis", "redis/connection/hiredis"] -# We use some ams 0.8.0 features, need to amend code -# to support 0.9 etc, bench needs to run and ensure no -# perf regressions -if rails_master? - gem 'active_model_serializers', github: 'rails-api/active_model_serializers', branch: '0-8-stable' -else - gem 'active_model_serializers', '~> 0.8.0' -end - +gem 'active_model_serializers', '~> 0.8.3' gem 'onebox' diff --git a/Gemfile.lock b/Gemfile.lock index 6ffdd73624c..94a9bd75f81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GEM activesupport (= 4.1.10) builder (~> 3.1) erubis (~> 2.7.0) - active_model_serializers (0.8.2) + active_model_serializers (0.8.3) activemodel (>= 3.0) activemodel (4.1.10) activesupport (= 4.1.10) @@ -460,7 +460,7 @@ PLATFORMS DEPENDENCIES actionpack-action_caching - active_model_serializers (~> 0.8.0) + active_model_serializers (~> 0.8.3) annotate babel-transpiler barber