Update rails to version 4.2.1
This commit is contained in:
parent
387fed7608
commit
c4b862129c
2
Gemfile
2
Gemfile
|
@ -1,7 +1,7 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
ruby '2.2.1'
|
ruby '2.2.1'
|
||||||
|
|
||||||
gem 'rails', '~> 4.2.0'
|
gem 'rails', '~> 4.2.1'
|
||||||
|
|
||||||
gem 'arel'
|
gem 'arel'
|
||||||
gem 'devise'
|
gem 'devise'
|
||||||
|
|
62
Gemfile.lock
62
Gemfile.lock
|
@ -1,36 +1,36 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.0)
|
actionmailer (4.2.1)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.1)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.1)
|
||||||
activejob (= 4.2.0)
|
activejob (= 4.2.1)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
actionpack (4.2.0)
|
actionpack (4.2.1)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
rack (~> 1.6.0)
|
rack (~> 1.6)
|
||||||
rack-test (~> 0.6.2)
|
rack-test (~> 0.6.2)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||||
actionview (4.2.0)
|
actionview (4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
||||||
activejob (4.2.0)
|
activejob (4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.0)
|
activemodel (4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.0)
|
activerecord (4.2.1)
|
||||||
activemodel (= 4.2.0)
|
activemodel (= 4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.0)
|
activesupport (4.2.1)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
json (~> 1.7, >= 1.7.7)
|
json (~> 1.7, >= 1.7.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -121,16 +121,16 @@ GEM
|
||||||
rack (~> 1.1)
|
rack (~> 1.1)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.0)
|
rails (4.2.1)
|
||||||
actionmailer (= 4.2.0)
|
actionmailer (= 4.2.1)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.1)
|
||||||
actionview (= 4.2.0)
|
actionview (= 4.2.1)
|
||||||
activejob (= 4.2.0)
|
activejob (= 4.2.1)
|
||||||
activemodel (= 4.2.0)
|
activemodel (= 4.2.1)
|
||||||
activerecord (= 4.2.0)
|
activerecord (= 4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.0)
|
railties (= 4.2.1)
|
||||||
sprockets-rails
|
sprockets-rails
|
||||||
rails-deprecated_sanitizer (1.0.3)
|
rails-deprecated_sanitizer (1.0.3)
|
||||||
activesupport (>= 4.2.0.alpha)
|
activesupport (>= 4.2.0.alpha)
|
||||||
|
@ -159,9 +159,9 @@ GEM
|
||||||
sass-rails (>= 4.0, < 6)
|
sass-rails (>= 4.0, < 6)
|
||||||
rails_serve_static_assets (0.0.4)
|
rails_serve_static_assets (0.0.4)
|
||||||
rails_stdout_logging (0.0.3)
|
rails_stdout_logging (0.0.3)
|
||||||
railties (4.2.0)
|
railties (4.2.1)
|
||||||
actionpack (= 4.2.0)
|
actionpack (= 4.2.1)
|
||||||
activesupport (= 4.2.0)
|
activesupport (= 4.2.1)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
|
@ -240,7 +240,7 @@ DEPENDENCIES
|
||||||
pg
|
pg
|
||||||
pry
|
pry
|
||||||
puma
|
puma
|
||||||
rails (~> 4.2.0)
|
rails (~> 4.2.1)
|
||||||
rails_12factor
|
rails_12factor
|
||||||
rails_admin
|
rails_admin
|
||||||
rubocop
|
rubocop
|
||||||
|
|
Loading…
Reference in New Issue