mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
updating arel and journey dependencies
This commit is contained in:
parent
800252ca71
commit
b6105b0b59
3 changed files with 4 additions and 4 deletions
4
Gemfile
4
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
|
||||
|
|
|
@ -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')
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue