mirror of https://github.com/mastodon/mastodon
Update Rails to 5.0.1
This commit is contained in:
parent
318e63cb79
commit
c128fcee16
4
Gemfile
4
Gemfile
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', git: 'https://github.com/rails/rails.git', branch: '5-0-stable'
|
gem 'rails', '~> 5.0.1.0'
|
||||||
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'
|
||||||
|
@ -41,7 +41,6 @@ gem 'simple_form'
|
||||||
gem 'will_paginate'
|
gem 'will_paginate'
|
||||||
gem 'rack-attack'
|
gem 'rack-attack'
|
||||||
gem 'rack-cors', require: 'rack/cors'
|
gem 'rack-cors', require: 'rack/cors'
|
||||||
gem 'rack-timeout-puma'
|
|
||||||
gem 'sidekiq'
|
gem 'sidekiq'
|
||||||
gem 'ledermann-rails-settings'
|
gem 'ledermann-rails-settings'
|
||||||
gem 'pg_search'
|
gem 'pg_search'
|
||||||
|
@ -78,4 +77,5 @@ group :production do
|
||||||
gem 'rails_12factor'
|
gem 'rails_12factor'
|
||||||
gem 'lograge'
|
gem 'lograge'
|
||||||
gem 'redis-rails'
|
gem 'redis-rails'
|
||||||
|
gem 'rack-timeout-puma'
|
||||||
end
|
end
|
||||||
|
|
96
Gemfile.lock
96
Gemfile.lock
|
@ -1,68 +1,44 @@
|
||||||
GIT
|
GEM
|
||||||
remote: https://github.com/rails/rails.git
|
remote: https://rubygems.org/
|
||||||
revision: c7a716aa5a692cae301d56b345faa5d79cbfc320
|
|
||||||
branch: 5-0-stable
|
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.0.0.1)
|
actioncable (5.0.1)
|
||||||
actionpack (= 5.0.0.1)
|
actionpack (= 5.0.1)
|
||||||
nio4r (~> 1.2)
|
nio4r (~> 1.2)
|
||||||
websocket-driver (~> 0.6.1)
|
websocket-driver (~> 0.6.1)
|
||||||
actionmailer (5.0.0.1)
|
actionmailer (5.0.1)
|
||||||
actionpack (= 5.0.0.1)
|
actionpack (= 5.0.1)
|
||||||
actionview (= 5.0.0.1)
|
actionview (= 5.0.1)
|
||||||
activejob (= 5.0.0.1)
|
activejob (= 5.0.1)
|
||||||
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.0.1)
|
actionpack (5.0.1)
|
||||||
actionview (= 5.0.0.1)
|
actionview (= 5.0.1)
|
||||||
activesupport (= 5.0.0.1)
|
activesupport (= 5.0.1)
|
||||||
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.0.1)
|
actionview (5.0.1)
|
||||||
activesupport (= 5.0.0.1)
|
activesupport (= 5.0.1)
|
||||||
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.2)
|
||||||
activejob (5.0.0.1)
|
active_record_query_trace (1.5.3)
|
||||||
activesupport (= 5.0.0.1)
|
activejob (5.0.1)
|
||||||
|
activesupport (= 5.0.1)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.0.0.1)
|
activemodel (5.0.1)
|
||||||
activesupport (= 5.0.0.1)
|
activesupport (= 5.0.1)
|
||||||
activerecord (5.0.0.1)
|
activerecord (5.0.1)
|
||||||
activemodel (= 5.0.0.1)
|
activemodel (= 5.0.1)
|
||||||
activesupport (= 5.0.0.1)
|
activesupport (= 5.0.1)
|
||||||
arel (~> 7.0)
|
arel (~> 7.0)
|
||||||
activesupport (5.0.0.1)
|
activesupport (5.0.1)
|
||||||
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)
|
||||||
tzinfo (~> 1.1)
|
tzinfo (~> 1.1)
|
||||||
rails (5.0.0.1)
|
|
||||||
actioncable (= 5.0.0.1)
|
|
||||||
actionmailer (= 5.0.0.1)
|
|
||||||
actionpack (= 5.0.0.1)
|
|
||||||
actionview (= 5.0.0.1)
|
|
||||||
activejob (= 5.0.0.1)
|
|
||||||
activemodel (= 5.0.0.1)
|
|
||||||
activerecord (= 5.0.0.1)
|
|
||||||
activesupport (= 5.0.0.1)
|
|
||||||
bundler (>= 1.3.0, < 2.0)
|
|
||||||
railties (= 5.0.0.1)
|
|
||||||
sprockets-rails (>= 2.0.0)
|
|
||||||
railties (5.0.0.1)
|
|
||||||
actionpack (= 5.0.0.1)
|
|
||||||
activesupport (= 5.0.0.1)
|
|
||||||
method_source
|
|
||||||
rake (>= 0.8.7)
|
|
||||||
thor (>= 0.18.1, < 2.0)
|
|
||||||
|
|
||||||
GEM
|
|
||||||
remote: https://rubygems.org/
|
|
||||||
specs:
|
|
||||||
active_record_query_trace (1.5.3)
|
|
||||||
addressable (2.4.0)
|
addressable (2.4.0)
|
||||||
arel (7.1.4)
|
arel (7.1.4)
|
||||||
ast (2.3.0)
|
ast (2.3.0)
|
||||||
|
@ -109,7 +85,7 @@ GEM
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.10.0)
|
coffee-script-source (1.10.0)
|
||||||
colorize (0.8.1)
|
colorize (0.8.1)
|
||||||
concurrent-ruby (1.0.2)
|
concurrent-ruby (1.0.3)
|
||||||
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)
|
||||||
|
@ -214,7 +190,7 @@ GEM
|
||||||
mime-types-data (3.2016.0521)
|
mime-types-data (3.2016.0521)
|
||||||
mimemagic (0.3.2)
|
mimemagic (0.3.2)
|
||||||
mini_portile2 (2.1.0)
|
mini_portile2 (2.1.0)
|
||||||
minitest (5.9.1)
|
minitest (5.10.1)
|
||||||
multi_json (1.12.1)
|
multi_json (1.12.1)
|
||||||
nio4r (1.2.1)
|
nio4r (1.2.1)
|
||||||
nokogiri (1.6.8.1)
|
nokogiri (1.6.8.1)
|
||||||
|
@ -264,6 +240,18 @@ GEM
|
||||||
rack-timeout (0.4.2)
|
rack-timeout (0.4.2)
|
||||||
rack-timeout-puma (0.0.1)
|
rack-timeout-puma (0.0.1)
|
||||||
rack-timeout (~> 0.2, >= 0.2.0)
|
rack-timeout (~> 0.2, >= 0.2.0)
|
||||||
|
rails (5.0.1)
|
||||||
|
actioncable (= 5.0.1)
|
||||||
|
actionmailer (= 5.0.1)
|
||||||
|
actionpack (= 5.0.1)
|
||||||
|
actionview (= 5.0.1)
|
||||||
|
activejob (= 5.0.1)
|
||||||
|
activemodel (= 5.0.1)
|
||||||
|
activerecord (= 5.0.1)
|
||||||
|
activesupport (= 5.0.1)
|
||||||
|
bundler (>= 1.3.0, < 2.0)
|
||||||
|
railties (= 5.0.1)
|
||||||
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-dom-testing (2.0.1)
|
rails-dom-testing (2.0.1)
|
||||||
activesupport (>= 4.2.0, < 6.0)
|
activesupport (>= 4.2.0, < 6.0)
|
||||||
nokogiri (~> 1.6.0)
|
nokogiri (~> 1.6.0)
|
||||||
|
@ -276,8 +264,14 @@ GEM
|
||||||
rails (> 3.1)
|
rails (> 3.1)
|
||||||
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)
|
||||||
|
actionpack (= 5.0.1)
|
||||||
|
activesupport (= 5.0.1)
|
||||||
|
method_source
|
||||||
|
rake (>= 0.8.7)
|
||||||
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.1.0)
|
rainbow (2.1.0)
|
||||||
rake (11.3.0)
|
rake (12.0.0)
|
||||||
rdoc (4.2.2)
|
rdoc (4.2.2)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
react-rails (1.8.2)
|
react-rails (1.8.2)
|
||||||
|
@ -364,7 +358,7 @@ GEM
|
||||||
simplecov-html (~> 0.10.0)
|
simplecov-html (~> 0.10.0)
|
||||||
simplecov-html (0.10.0)
|
simplecov-html (0.10.0)
|
||||||
slop (3.6.0)
|
slop (3.6.0)
|
||||||
sprockets (3.7.0)
|
sprockets (3.7.1)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (3.2.0)
|
sprockets-rails (3.2.0)
|
||||||
|
@ -448,7 +442,7 @@ DEPENDENCIES
|
||||||
rack-attack
|
rack-attack
|
||||||
rack-cors
|
rack-cors
|
||||||
rack-timeout-puma
|
rack-timeout-puma
|
||||||
rails!
|
rails (~> 5.0.1.0)
|
||||||
rails_12factor
|
rails_12factor
|
||||||
rails_autolink
|
rails_autolink
|
||||||
react-rails
|
react-rails
|
||||||
|
|
Loading…
Reference in New Issue