Update to latest compatible rails
This commit is contained in:
parent
965e080c0d
commit
0079cb1d22
2
Gemfile
2
Gemfile
|
@ -3,7 +3,7 @@ source 'https://rubygems.org'
|
||||||
gem 'byebug'
|
gem 'byebug'
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
|
||||||
gem 'rails', '4.2.10'
|
gem 'rails', '4.2.11.1'
|
||||||
|
|
||||||
# Assets
|
# Assets
|
||||||
gem 'sass-rails', '~> 4.0.3'
|
gem 'sass-rails', '~> 4.0.3'
|
||||||
|
|
60
Gemfile.lock
60
Gemfile.lock
|
@ -1,36 +1,36 @@
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (4.2.10)
|
actionmailer (4.2.11.1)
|
||||||
actionpack (= 4.2.10)
|
actionpack (= 4.2.11.1)
|
||||||
actionview (= 4.2.10)
|
actionview (= 4.2.11.1)
|
||||||
activejob (= 4.2.10)
|
activejob (= 4.2.11.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.10)
|
actionpack (4.2.11.1)
|
||||||
actionview (= 4.2.10)
|
actionview (= 4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.1)
|
||||||
rack (~> 1.6)
|
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.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (4.2.10)
|
actionview (4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.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.3)
|
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||||
activejob (4.2.10)
|
activejob (4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.1)
|
||||||
globalid (>= 0.3.0)
|
globalid (>= 0.3.0)
|
||||||
activemodel (4.2.10)
|
activemodel (4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.1)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
activerecord (4.2.10)
|
activerecord (4.2.11.1)
|
||||||
activemodel (= 4.2.10)
|
activemodel (= 4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.1)
|
||||||
arel (~> 6.0)
|
arel (~> 6.0)
|
||||||
activesupport (4.2.10)
|
activesupport (4.2.11.1)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
thread_safe (~> 0.3, >= 0.3.4)
|
thread_safe (~> 0.3, >= 0.3.4)
|
||||||
|
@ -201,16 +201,16 @@ GEM
|
||||||
rack (1.6.11)
|
rack (1.6.11)
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.2.10)
|
rails (4.2.11.1)
|
||||||
actionmailer (= 4.2.10)
|
actionmailer (= 4.2.11.1)
|
||||||
actionpack (= 4.2.10)
|
actionpack (= 4.2.11.1)
|
||||||
actionview (= 4.2.10)
|
actionview (= 4.2.11.1)
|
||||||
activejob (= 4.2.10)
|
activejob (= 4.2.11.1)
|
||||||
activemodel (= 4.2.10)
|
activemodel (= 4.2.11.1)
|
||||||
activerecord (= 4.2.10)
|
activerecord (= 4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.1)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 4.2.10)
|
railties (= 4.2.11.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)
|
||||||
|
@ -220,9 +220,9 @@ GEM
|
||||||
rails-deprecated_sanitizer (>= 1.0.1)
|
rails-deprecated_sanitizer (>= 1.0.1)
|
||||||
rails-html-sanitizer (1.2.0)
|
rails-html-sanitizer (1.2.0)
|
||||||
loofah (~> 2.2, >= 2.2.2)
|
loofah (~> 2.2, >= 2.2.2)
|
||||||
railties (4.2.10)
|
railties (4.2.11.1)
|
||||||
actionpack (= 4.2.10)
|
actionpack (= 4.2.11.1)
|
||||||
activesupport (= 4.2.10)
|
activesupport (= 4.2.11.1)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rake (12.3.3)
|
rake (12.3.3)
|
||||||
|
@ -335,7 +335,7 @@ DEPENDENCIES
|
||||||
mysql2 (~> 0.4.10)
|
mysql2 (~> 0.4.10)
|
||||||
omniauth-oauth2 (= 1.3.1)
|
omniauth-oauth2 (= 1.3.1)
|
||||||
paperclip (>= 5.2.0)
|
paperclip (>= 5.2.0)
|
||||||
rails (= 4.2.10)
|
rails (= 4.2.11.1)
|
||||||
rspec-rails
|
rspec-rails
|
||||||
sass-rails (~> 4.0.3)
|
sass-rails (~> 4.0.3)
|
||||||
sdoc (~> 0.4.0)
|
sdoc (~> 0.4.0)
|
||||||
|
|
Loading…
Reference in a new issue