aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-05 00:28:51 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-05 00:28:57 -0200
commit18be17ac43c7e40ba184e9f279a0075cab3346b9 (patch)
tree6a0031f64206671bf8fd08a8e0ad7442b9181645
parent4f330b042833452d590122ce524d4e06e5039216 (diff)
downloadrails-18be17ac43c7e40ba184e9f279a0075cab3346b9.tar.gz
rails-18be17ac43c7e40ba184e9f279a0075cab3346b9.tar.bz2
rails-18be17ac43c7e40ba184e9f279a0075cab3346b9.zip
Use the released arel gem
-rw-r--r--Gemfile1
-rw-r--r--activerecord/activerecord.gemspec2
2 files changed, 1 insertions, 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