From 18be17ac43c7e40ba184e9f279a0075cab3346b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Thu, 5 Dec 2013 00:28:51 -0200 Subject: Use the released arel gem --- Gemfile | 1 - activerecord/activerecord.gemspec | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e1278e6fdf..746dbac325 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ 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: 'master' # 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 e1c5b05c36..d397c9e016 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', '~> 5.0.0' + s.add_dependency 'arel', '~> 5.0.0' end -- cgit v1.2.3