From a6f58a535ee4647b541988c5a0c8a98b9c6c4249 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Tue, 19 Nov 2013 15:33:42 +0100 Subject: 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. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gemfile') 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 -- cgit v1.2.3