mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Upgrade Rails to 5.0.2
This commit is contained in:
parent
8aae42f3d8
commit
7637386228
2
Gemfile
2
Gemfile
@ -3,7 +3,7 @@
|
|||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
ruby '2.3.1'
|
ruby '2.3.1'
|
||||||
|
|
||||||
gem 'rails', '~> 5.0.1.0'
|
gem 'rails', '~> 5.0.2'
|
||||||
gem 'sass-rails', '~> 5.0'
|
gem 'sass-rails', '~> 5.0'
|
||||||
gem 'uglifier', '>= 1.3.0'
|
gem 'uglifier', '>= 1.3.0'
|
||||||
gem 'coffee-rails', '~> 4.1.0'
|
gem 'coffee-rails', '~> 4.1.0'
|
||||||
|
78
Gemfile.lock
78
Gemfile.lock
@ -1,40 +1,40 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.0.1)
|
actioncable (5.0.2)
|
||||||
actionpack (= 5.0.1)
|
actionpack (= 5.0.2)
|
||||||
nio4r (~> 1.2)
|
nio4r (>= 1.2, < 3.0)
|
||||||
websocket-driver (~> 0.6.1)
|
websocket-driver (~> 0.6.1)
|
||||||
actionmailer (5.0.1)
|
actionmailer (5.0.2)
|
||||||
actionpack (= 5.0.1)
|
actionpack (= 5.0.2)
|
||||||
actionview (= 5.0.1)
|
actionview (= 5.0.2)
|
||||||
activejob (= 5.0.1)
|
activejob (= 5.0.2)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.0.1)
|
actionpack (5.0.2)
|
||||||
actionview (= 5.0.1)
|
actionview (= 5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
rack (~> 2.0)
|
rack (~> 2.0)
|
||||||
rack-test (~> 0.6.3)
|
rack-test (~> 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||||
actionview (5.0.1)
|
actionview (5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||||
active_record_query_trace (1.5.3)
|
active_record_query_trace (1.5.3)
|
||||||
activejob (5.0.1)
|
activejob (5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.0.1)
|
activemodel (5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
activerecord (5.0.1)
|
activerecord (5.0.2)
|
||||||
activemodel (= 5.0.1)
|
activemodel (= 5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
arel (~> 7.0)
|
arel (~> 7.0)
|
||||||
activesupport (5.0.1)
|
activesupport (5.0.2)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (~> 0.7)
|
i18n (~> 0.7)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
@ -114,7 +114,7 @@ GEM
|
|||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.12.2)
|
coffee-script-source (1.12.2)
|
||||||
colorize (0.8.1)
|
colorize (0.8.1)
|
||||||
concurrent-ruby (1.0.4)
|
concurrent-ruby (1.0.5)
|
||||||
connection_pool (2.2.1)
|
connection_pool (2.2.1)
|
||||||
crack (0.4.3)
|
crack (0.4.3)
|
||||||
safe_yaml (~> 1.0.0)
|
safe_yaml (~> 1.0.0)
|
||||||
@ -233,8 +233,8 @@ GEM
|
|||||||
net-scp (1.2.1)
|
net-scp (1.2.1)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (4.0.1)
|
net-ssh (4.0.1)
|
||||||
nio4r (1.2.1)
|
nio4r (2.0.0)
|
||||||
nokogiri (1.7.0.1)
|
nokogiri (1.7.1)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
oj (2.17.3)
|
oj (2.17.3)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
@ -276,17 +276,17 @@ GEM
|
|||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rack-timeout (0.4.2)
|
rack-timeout (0.4.2)
|
||||||
rails (5.0.1)
|
rails (5.0.2)
|
||||||
actioncable (= 5.0.1)
|
actioncable (= 5.0.2)
|
||||||
actionmailer (= 5.0.1)
|
actionmailer (= 5.0.2)
|
||||||
actionpack (= 5.0.1)
|
actionpack (= 5.0.2)
|
||||||
actionview (= 5.0.1)
|
actionview (= 5.0.2)
|
||||||
activejob (= 5.0.1)
|
activejob (= 5.0.2)
|
||||||
activemodel (= 5.0.1)
|
activemodel (= 5.0.2)
|
||||||
activerecord (= 5.0.1)
|
activerecord (= 5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
bundler (>= 1.3.0, < 2.0)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
railties (= 5.0.1)
|
railties (= 5.0.2)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-dom-testing (2.0.2)
|
rails-dom-testing (2.0.2)
|
||||||
activesupport (>= 4.2.0, < 6.0)
|
activesupport (>= 4.2.0, < 6.0)
|
||||||
@ -300,9 +300,9 @@ GEM
|
|||||||
rails_stdout_logging
|
rails_stdout_logging
|
||||||
rails_serve_static_assets (0.0.5)
|
rails_serve_static_assets (0.0.5)
|
||||||
rails_stdout_logging (0.0.5)
|
rails_stdout_logging (0.0.5)
|
||||||
railties (5.0.1)
|
railties (5.0.2)
|
||||||
actionpack (= 5.0.1)
|
actionpack (= 5.0.2)
|
||||||
activesupport (= 5.0.1)
|
activesupport (= 5.0.2)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
@ -436,7 +436,7 @@ GEM
|
|||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
hashdiff
|
hashdiff
|
||||||
websocket-driver (0.6.4)
|
websocket-driver (0.6.5)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.2)
|
websocket-extensions (0.1.2)
|
||||||
will_paginate (3.1.0)
|
will_paginate (3.1.0)
|
||||||
@ -494,7 +494,7 @@ DEPENDENCIES
|
|||||||
rack-attack
|
rack-attack
|
||||||
rack-cors
|
rack-cors
|
||||||
rack-timeout
|
rack-timeout
|
||||||
rails (~> 5.0.1.0)
|
rails (~> 5.0.2)
|
||||||
rails-settings-cached
|
rails-settings-cached
|
||||||
rails_12factor
|
rails_12factor
|
||||||
react-rails
|
react-rails
|
||||||
|
Loading…
Reference in New Issue
Block a user