aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2011-12-14 13:26:41 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2011-12-14 13:26:49 -0800
commitb6105b0b59073efe7d8c5fad0b2246d0534030e1 (patch)
tree92665487d26672a2cafc92acbcfe7ec61f5f6d4c
parent800252ca71ac731db16e72cbcd4e817e2bfb8e7b (diff)
downloadrails-b6105b0b59073efe7d8c5fad0b2246d0534030e1.tar.gz
rails-b6105b0b59073efe7d8c5fad0b2246d0534030e1.tar.bz2
rails-b6105b0b59073efe7d8c5fad0b2246d0534030e1.zip
updating arel and journey dependencies
-rw-r--r--Gemfile4
-rw-r--r--actionpack/actionpack.gemspec2
-rw-r--r--activerecord/activerecord.gemspec2
3 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 5f5c161224..ea4869a89e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,7 +5,7 @@ gemspec
if ENV['AREL']
gem 'arel', :path => ENV['AREL']
else
- gem 'arel', :git => 'git://github.com/rails/arel'
+ gem 'arel'
end
gem 'bcrypt-ruby', '~> 3.0.0'
@@ -14,7 +14,7 @@ gem 'jquery-rails'
if ENV['JOURNEY']
gem 'journey', :path => ENV['JOURNEY']
else
- gem 'journey', :git => 'git://github.com/rails/journey'
+ gem 'journey'
end
# This needs to be with require false to avoid
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
index d6e9519915..1aa346929e 100644
--- a/actionpack/actionpack.gemspec
+++ b/actionpack/actionpack.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
s.add_dependency('i18n', '~> 0.6')
s.add_dependency('rack', '~> 1.3.5')
s.add_dependency('rack-test', '~> 0.6.1')
- s.add_dependency('journey', '~> 1.0.0')
+ s.add_dependency('journey', '~> 1.0.0.rc1')
s.add_dependency('sprockets', '~> 2.1.2')
s.add_dependency('erubis', '~> 2.7.0')
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index 52a3d4a501..b6a8db1ac0 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', '~> 3.0.0.pre')
+ s.add_dependency('arel', '~> 3.0.0.rc1')
s.add_dependency('tzinfo', '~> 0.3.29')
end