Bump Rails dependencies to 4-0-stable
This commit is contained in:
parent
1071d8f714
commit
9be3efe9e8
6
Gemfile
6
Gemfile
|
@ -3,9 +3,9 @@ source 'https://rubygems.org'
|
||||||
gemspec
|
gemspec
|
||||||
|
|
||||||
gem 'country_select', '~> 1.1.1'
|
gem 'country_select', '~> 1.1.1'
|
||||||
gem 'railties', '>= 4.0.0', '< 4.1'
|
gem 'railties', github: 'rails/rails', branch: '4-0-stable'
|
||||||
gem 'activemodel', '>= 4.0.0', '< 4.1'
|
gem 'activemodel', github: 'rails/rails', branch: '4-0-stable'
|
||||||
gem 'actionpack', '>= 4.0.0', '< 4.1'
|
gem 'actionpack', github: 'rails/rails', branch: '4-0-stable'
|
||||||
gem 'rake'
|
gem 'rake'
|
||||||
gem 'rdoc'
|
gem 'rdoc'
|
||||||
gem 'tzinfo'
|
gem 'tzinfo'
|
||||||
|
|
40
Gemfile.lock
40
Gemfile.lock
|
@ -1,12 +1,7 @@
|
||||||
PATH
|
GIT
|
||||||
remote: .
|
remote: git://github.com/rails/rails.git
|
||||||
specs:
|
revision: b632a8237745c62747558551c74e32a3bb056e09
|
||||||
simple_form (3.0.1)
|
branch: 4-0-stable
|
||||||
actionpack (>= 4.0.0, < 4.1)
|
|
||||||
activemodel (>= 4.0.0, < 4.1)
|
|
||||||
|
|
||||||
GEM
|
|
||||||
remote: https://rubygems.org/
|
|
||||||
specs:
|
specs:
|
||||||
actionpack (4.0.2)
|
actionpack (4.0.2)
|
||||||
activesupport (= 4.0.2)
|
activesupport (= 4.0.2)
|
||||||
|
@ -23,6 +18,22 @@ GEM
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
tzinfo (~> 0.3.37)
|
tzinfo (~> 0.3.37)
|
||||||
|
railties (4.0.2)
|
||||||
|
actionpack (= 4.0.2)
|
||||||
|
activesupport (= 4.0.2)
|
||||||
|
rake (>= 0.8.7)
|
||||||
|
thor (>= 0.18.1, < 2.0)
|
||||||
|
|
||||||
|
PATH
|
||||||
|
remote: .
|
||||||
|
specs:
|
||||||
|
simple_form (3.0.1)
|
||||||
|
actionpack (>= 4.0.0, < 4.1)
|
||||||
|
activemodel (>= 4.0.0, < 4.1)
|
||||||
|
|
||||||
|
GEM
|
||||||
|
remote: https://rubygems.org/
|
||||||
|
specs:
|
||||||
atomic (1.1.14)
|
atomic (1.1.14)
|
||||||
builder (3.1.4)
|
builder (3.1.4)
|
||||||
country_select (1.1.3)
|
country_select (1.1.3)
|
||||||
|
@ -34,11 +45,6 @@ GEM
|
||||||
rack (1.5.2)
|
rack (1.5.2)
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
railties (4.0.2)
|
|
||||||
actionpack (= 4.0.2)
|
|
||||||
activesupport (= 4.0.2)
|
|
||||||
rake (>= 0.8.7)
|
|
||||||
thor (>= 0.18.1, < 2.0)
|
|
||||||
rake (10.1.0)
|
rake (10.1.0)
|
||||||
rdoc (4.0.1)
|
rdoc (4.0.1)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
|
@ -51,10 +57,10 @@ PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
actionpack (>= 4.0.0, < 4.1)
|
actionpack!
|
||||||
activemodel (>= 4.0.0, < 4.1)
|
activemodel!
|
||||||
country_select (~> 1.1.1)
|
country_select (~> 1.1.1)
|
||||||
railties (>= 4.0.0, < 4.1)
|
railties!
|
||||||
rake
|
rake
|
||||||
rdoc
|
rdoc
|
||||||
simple_form!
|
simple_form!
|
||||||
|
|
Loading…
Reference in New Issue