aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGodfrey Chan <godfreykfc@gmail.com>2014-10-30 14:07:24 -0700
committerGodfrey Chan <godfreykfc@gmail.com>2014-10-30 14:07:24 -0700
commitc747d4c48c2213da7946090450c250dfca6870f8 (patch)
treeb4b423572d55b81e0fc90c6268acdbf394bbc325
parent810b7914f39ad6a6168ff19a8c2761601654f998 (diff)
downloadrails-c747d4c48c2213da7946090450c250dfca6870f8.tar.gz
rails-c747d4c48c2213da7946090450c250dfca6870f8.tar.bz2
rails-c747d4c48c2213da7946090450c250dfca6870f8.zip
Use released arel
-rw-r--r--Gemfile2
-rw-r--r--activerecord/activerecord.gemspec2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 6f4e91100b..f6fd0f3ac0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 4.0.0.beta2'
gem 'coffee-rails', '~> 4.1.0'
gem 'turbolinks'
-gem 'arel', github: 'rails/arel', branch: 'master'
+gem 'arel', '~> 6.0.0.beta2'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid ActiveModel (and by extension the entire framework)
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 6231851be5..bc10e96244 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', '>= 6.0.0.beta1', '< 6.1'
+ s.add_dependency 'arel', '>= 6.0.0.beta2', '< 6.1'
end