aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-11-19 15:33:42 +0100
committerYves Senn <yves.senn@gmail.com>2013-11-19 15:34:20 +0100
commita6f58a535ee4647b541988c5a0c8a98b9c6c4249 (patch)
tree83d86fbe4c35cf0b26d2ce653fb6657f5f801b11 /Gemfile
parent3053fee954c1e28b23f7e00921d7b9b3b3867fa5 (diff)
downloadrails-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.
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 46e5ead042..e82b4c2b27 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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