Update rails dependecy
This commit is contained in:
parent
6bfcb542f9
commit
4d41e9ccd4
3
Gemfile
3
Gemfile
|
@ -6,8 +6,7 @@ gem 'country_select', github: 'stefanpenner/country_select', branch: 'master'
|
|||
gem 'railties', '>= 4.0.0.beta', '< 4.1', github: 'rails/rails', branch: 'master'
|
||||
gem 'activemodel', '>= 4.0.0.beta', '< 4.1', github: 'rails/rails', branch: 'master'
|
||||
gem 'actionpack', '>= 4.0.0.beta', '< 4.1', github: 'rails/rails', branch: 'master'
|
||||
gem 'journey', github: 'rails/journey'
|
||||
gem 'rake'
|
||||
gem 'rdoc'
|
||||
gem 'mocha', :require => false
|
||||
gem 'mocha', require: false
|
||||
gem 'tzinfo'
|
||||
|
|
18
Gemfile.lock
18
Gemfile.lock
|
@ -1,19 +1,12 @@
|
|||
GIT
|
||||
remote: git://github.com/rails/journey.git
|
||||
revision: 5e14f7477b3d05595bf950b33812793da2c3913c
|
||||
specs:
|
||||
journey (2.0.0.20120723141804)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails/rails.git
|
||||
revision: 5d54fd77b8e85ca7f6fb14916aea043725f49990
|
||||
revision: b05819fd28acd069556767a99738a6fd8b0a1965
|
||||
branch: master
|
||||
specs:
|
||||
actionpack (4.0.0.beta)
|
||||
activesupport (= 4.0.0.beta)
|
||||
builder (~> 3.1.0)
|
||||
erubis (~> 2.7.0)
|
||||
journey (~> 2.0.0)
|
||||
rack (~> 1.4.1)
|
||||
rack-test (~> 0.6.1)
|
||||
activemodel (4.0.0.beta)
|
||||
|
@ -23,6 +16,7 @@ GIT
|
|||
i18n (~> 0.6)
|
||||
minitest (~> 4.1)
|
||||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.33)
|
||||
railties (4.0.0.beta)
|
||||
actionpack (= 4.0.0.beta)
|
||||
|
@ -48,22 +42,25 @@ PATH
|
|||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
atomic (1.0.1)
|
||||
builder (3.1.4)
|
||||
erubis (2.7.0)
|
||||
i18n (0.6.1)
|
||||
json (1.7.5)
|
||||
metaclass (0.0.1)
|
||||
minitest (4.3.3)
|
||||
mocha (0.13.0)
|
||||
mocha (0.13.1)
|
||||
metaclass (~> 0.0.1)
|
||||
multi_json (1.5.0)
|
||||
rack (1.4.1)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rake (10.0.1)
|
||||
rake (10.0.3)
|
||||
rdoc (3.12)
|
||||
json (~> 1.4)
|
||||
thor (0.16.0)
|
||||
thread_safe (0.1.0)
|
||||
atomic
|
||||
tzinfo (0.3.35)
|
||||
|
||||
PLATFORMS
|
||||
|
@ -72,7 +69,6 @@ PLATFORMS
|
|||
DEPENDENCIES
|
||||
actionpack (>= 4.0.0.beta, < 4.1)!
|
||||
activemodel (>= 4.0.0.beta, < 4.1)!
|
||||
journey!
|
||||
country_select!
|
||||
mocha
|
||||
railties (>= 4.0.0.beta, < 4.1)!
|
||||
|
|
Loading…
Reference in New Issue