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

pull in latest arel

This commit is contained in:
Sam 2014-11-13 08:51:06 +11:00
parent 4fc3834dd6
commit ab481bb7a9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@ -70,6 +70,7 @@ end
gem 'seed-fu', '~> 2.3.3' gem 'seed-fu', '~> 2.3.3'
if rails_master? if rails_master?
gem 'arel', git: 'https://github.com/rails/arel.git'
gem 'rails', git: 'https://github.com/rails/rails.git' gem 'rails', git: 'https://github.com/rails/rails.git'
else else
gem 'rails' gem 'rails'

8
Gemfile_master.lock
View File

@ -6,6 +6,12 @@ GIT
active_model_serializers (0.8.2) active_model_serializers (0.8.2)
activemodel (>= 3.0) activemodel (>= 3.0)
GIT
remote: https://github.com/rails/arel.git
revision: 5035526b534a5d7c9d95eb6b66ade349c3a947f0
specs:
arel (6.0.0.beta2)
GIT GIT
remote: https://github.com/rails/rails.git remote: https://github.com/rails/rails.git
revision: 46f172798e56ba5383ba5305e2cce5aad02e8e30 revision: 46f172798e56ba5383ba5305e2cce5aad02e8e30
@ -86,7 +92,6 @@ GEM
annotate (2.6.5) annotate (2.6.5)
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
rake (>= 0.8.7) rake (>= 0.8.7)
arel (6.0.0.beta2)
barber (0.4.2) barber (0.4.2)
ember-source ember-source
execjs execjs
@ -446,6 +451,7 @@ DEPENDENCIES
actionpack-action_caching actionpack-action_caching
active_model_serializers! active_model_serializers!
annotate annotate
arel!
barber barber
better_errors better_errors
binding_of_caller binding_of_caller