aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-06-27 14:06:00 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-06-27 14:06:00 -0700
commit506b2dad55f43e22f46bd85129b08bfcc7ca25dc (patch)
treeccd9d4cb42978d7b7244a7824ab629da93d47f96
parent4bcb05de2d512cfa8c35e130c4b11f961f1b6e29 (diff)
parent1c23887ab010f8c7a4970492c3b401f79457b468 (diff)
downloadrails-506b2dad55f43e22f46bd85129b08bfcc7ca25dc.tar.gz
rails-506b2dad55f43e22f46bd85129b08bfcc7ca25dc.tar.bz2
rails-506b2dad55f43e22f46bd85129b08bfcc7ca25dc.zip
Merge pull request #1871 from guilleiguaran/arel-2-1-3
Bump ARel to 2.1.3
-rw-r--r--Gemfile2
-rw-r--r--activerecord/activerecord.gemspec2
2 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index ef9f613955..73585543b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gemspec
if ENV['AREL']
gem "arel", :path => ENV['AREL']
else
- gem "arel", '~> 2.1.0'
+ gem "arel", '~> 2.1.3'
end
gem "coffee-script"
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index b7e23faa09..aff0c51829 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('activemodel', version)
- s.add_dependency('arel', '~> 2.1.1')
+ s.add_dependency('arel', '~> 2.1.3')
s.add_dependency('tzinfo', '~> 0.3.27')
end