aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-25 19:58:08 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-11-25 19:58:08 -0200
commit25c85cb6f6d8715da3f7fae08b165d01e6b34348 (patch)
treeacfa6fc925669355b34a3ed39379ce6d610ed039
parente3f7817cec95ac395c9e1491178a1fad0a73af63 (diff)
downloadrails-25c85cb6f6d8715da3f7fae08b165d01e6b34348.tar.gz
rails-25c85cb6f6d8715da3f7fae08b165d01e6b34348.tar.bz2
rails-25c85cb6f6d8715da3f7fae08b165d01e6b34348.zip
Use released arel
-rw-r--r--Gemfile1
-rw-r--r--activerecord/activerecord.gemspec2
2 files changed, 1 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index e7b7913970..9f27acca6f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,6 @@ 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'
# 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 bc10e96244..834fffeb18 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.beta2', '< 6.1'
+ s.add_dependency 'arel', '~> 6.0'
end