Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3399 from zzakcanncode/bump_ams 

AMS 0.8.3 was released with the patch we want
This commit is contained in:
Sam 2015-04-29 14:32:00 +10:00
parent d7d93c20d7 5386b29b26
commit a0a1bcf90f
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile
View File

@ -91,15 +91,7 @@ gem 'mail', '~> 2.5.4'
gem 'hiredis' gem 'hiredis'
gem 'redis', require: ["redis", "redis/connection/hiredis"] gem 'redis', require: ["redis", "redis/connection/hiredis"]
# We use some ams 0.8.0 features, need to amend code gem 'active_model_serializers', '~> 0.8.3'
# 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 'onebox' gem 'onebox'

4
Gemfile.lock
View File

@ -22,7 +22,7 @@ GEM
activesupport (= 4.1.10) activesupport (= 4.1.10)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
active_model_serializers (0.8.2) active_model_serializers (0.8.3)
activemodel (>= 3.0) activemodel (>= 3.0)
activemodel (4.1.10) activemodel (4.1.10)
activesupport (= 4.1.10) activesupport (= 4.1.10)
@ -460,7 +460,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
actionpack-action_caching actionpack-action_caching
active_model_serializers (~> 0.8.0) active_model_serializers (~> 0.8.3)
annotate annotate
babel-transpiler babel-transpiler
barber barber