kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

use arel master and update activerecord to depend on arel 5.0.0.

Browse source 
This is a follow-up to 3053fee954.

> The `master` branch should use the `master` branch.
This commit is contained in:
Yves Senn 2013-11-19 15:33:42 +01:00
parent 3053fee954
commit a6f58a535e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -12,7 +12,7 @@ gem 'bcrypt-ruby', '~> 3.1.2'
gem 'jquery-rails', '~> 2.2.0'
gem 'turbolinks'
gem 'coffee-rails', '~> 4.0.0'
gem 'arel', github: 'rails/arel', branch: '4-0-stable'
gem 'arel', github: 'rails/arel'
# This needs to be with require false to avoid
# it being automatically loaded by sprockets

2
activerecord/activerecord.gemspec
View file

@ -24,5 +24,5 @@ Gem::Specification.new do |s|
s.add_dependency 'activesupport', version
s.add_dependency 'activemodel', version
s.add_dependency 'arel', '~> 4.0.0'
s.add_dependency 'arel', '~> 5.0.0'
end