diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-11-19 15:33:42 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-11-19 15:34:20 +0100 |
| commit | a6f58a535ee4647b541988c5a0c8a98b9c6c4249 (patch) | |
| tree | 83d86fbe4c35cf0b26d2ce653fb6657f5f801b11 | |
| parent | 3053fee954c1e28b23f7e00921d7b9b3b3867fa5 (diff) | |
| download | rails-a6f58a535ee4647b541988c5a0c8a98b9c6c4249.tar.gz rails-a6f58a535ee4647b541988c5a0c8a98b9c6c4249.tar.bz2 rails-a6f58a535ee4647b541988c5a0c8a98b9c6c4249.zip | |
use arel `master` and update activerecord to depend on arel `5.0.0`.
This is a follow-up to 3053fee954c1e28b23f7e00921d7b9b3b3867fa5.
> The `master` branch should use the `master` branch.
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | activerecord/activerecord.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec index 9986ded904..e1c5b05c36 100644 --- a/activerecord/activerecord.gemspec +++ b/activerecord/activerecord.gemspec @@ -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 |