aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/activerecord.gemspec
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-08-30 15:55:07 -0300
committerJosé Valim <jose.valim@gmail.com>2010-08-30 15:55:10 -0300
commitd37a65307d280e47eb5c15b61c0b20ac6cab6a84 (patch)
tree39f6e9036ab11b5059f34e72e65dfeca84bcbbff /activerecord/activerecord.gemspec
parent3c8e1f99b9613cca4813e2a1b062d58ec4b2627b (diff)
parentb422cda2ebfff4032f4c18271e96ad329c413dcc (diff)
downloadrails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.gz
rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.tar.bz2
rails-d37a65307d280e47eb5c15b61c0b20ac6cab6a84.zip
Merge josevalim/deprecations branch.
I maintained on purpose the DeprecatedUrlOptions in ActionMailer and the Deprecated configuration in Railties because they were already addressed by Piotr in his RSoC work.
Diffstat (limited to 'activerecord/activerecord.gemspec')
-rw-r--r--activerecord/activerecord.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 0ed88a06e2..1387d6e288 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency('activesupport', version)
s.add_dependency('activemodel', version)
- s.add_dependency('arel', '~> 1.0.0')
+ s.add_dependency('arel', '~> 1.0.1')
s.add_dependency('tzinfo', '~> 0.3.23')
end