mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-22 14:15:22 +00:00
Bump rails from 5.2.3 to 5.2.4 (#12584)
* Bump rails from 5.2.3 to 5.2.4 Bumps [rails](https://github.com/rails/rails) from 5.2.3 to 5.2.4. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.3...v5.2.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> * sprockets ~> 3.7
This commit is contained in:
parent
c436367c3c
commit
45f8968404
3
Gemfile
3
Gemfile
|
@ -6,7 +6,8 @@ ruby '>= 2.4.0', '< 2.7.0'
|
||||||
gem 'pkg-config', '~> 1.4'
|
gem 'pkg-config', '~> 1.4'
|
||||||
|
|
||||||
gem 'puma', '~> 4.3'
|
gem 'puma', '~> 4.3'
|
||||||
gem 'rails', '~> 5.2.3'
|
gem 'rails', '~> 5.2.4'
|
||||||
|
gem 'sprockets', '~> 3.7'
|
||||||
gem 'thor', '~> 0.20'
|
gem 'thor', '~> 0.20'
|
||||||
|
|
||||||
gem 'hamlit-rails', '~> 0.2'
|
gem 'hamlit-rails', '~> 0.2'
|
||||||
|
|
79
Gemfile.lock
79
Gemfile.lock
|
@ -44,25 +44,25 @@ GIT
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (5.2.3)
|
actioncable (5.2.4)
|
||||||
actionpack (= 5.2.3)
|
actionpack (= 5.2.4)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailer (5.2.3)
|
actionmailer (5.2.4)
|
||||||
actionpack (= 5.2.3)
|
actionpack (= 5.2.4)
|
||||||
actionview (= 5.2.3)
|
actionview (= 5.2.4)
|
||||||
activejob (= 5.2.3)
|
activejob (= 5.2.4)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (5.2.3)
|
actionpack (5.2.4)
|
||||||
actionview (= 5.2.3)
|
actionview (= 5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
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.2.3)
|
actionview (5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
|
@ -73,20 +73,20 @@ GEM
|
||||||
case_transform (>= 0.2)
|
case_transform (>= 0.2)
|
||||||
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
|
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
|
||||||
active_record_query_trace (1.7)
|
active_record_query_trace (1.7)
|
||||||
activejob (5.2.3)
|
activejob (5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (5.2.3)
|
activemodel (5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
activerecord (5.2.3)
|
activerecord (5.2.4)
|
||||||
activemodel (= 5.2.3)
|
activemodel (= 5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
arel (>= 9.0)
|
arel (>= 9.0)
|
||||||
activestorage (5.2.3)
|
activestorage (5.2.4)
|
||||||
actionpack (= 5.2.3)
|
actionpack (= 5.2.4)
|
||||||
activerecord (= 5.2.3)
|
activerecord (= 5.2.4)
|
||||||
marcel (~> 0.3.1)
|
marcel (~> 0.3.1)
|
||||||
activesupport (5.2.3)
|
activesupport (5.2.4)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 0.7, < 2)
|
i18n (>= 0.7, < 2)
|
||||||
minitest (~> 5.1)
|
minitest (~> 5.1)
|
||||||
|
@ -469,18 +469,18 @@ GEM
|
||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (5.2.3)
|
rails (5.2.4)
|
||||||
actioncable (= 5.2.3)
|
actioncable (= 5.2.4)
|
||||||
actionmailer (= 5.2.3)
|
actionmailer (= 5.2.4)
|
||||||
actionpack (= 5.2.3)
|
actionpack (= 5.2.4)
|
||||||
actionview (= 5.2.3)
|
actionview (= 5.2.4)
|
||||||
activejob (= 5.2.3)
|
activejob (= 5.2.4)
|
||||||
activemodel (= 5.2.3)
|
activemodel (= 5.2.4)
|
||||||
activerecord (= 5.2.3)
|
activerecord (= 5.2.4)
|
||||||
activestorage (= 5.2.3)
|
activestorage (= 5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
bundler (>= 1.3.0)
|
bundler (>= 1.3.0)
|
||||||
railties (= 5.2.3)
|
railties (= 5.2.4)
|
||||||
sprockets-rails (>= 2.0.0)
|
sprockets-rails (>= 2.0.0)
|
||||||
rails-controller-testing (1.0.4)
|
rails-controller-testing (1.0.4)
|
||||||
actionpack (>= 5.0.1.x)
|
actionpack (>= 5.0.1.x)
|
||||||
|
@ -496,9 +496,9 @@ GEM
|
||||||
railties (>= 5.0, < 6)
|
railties (>= 5.0, < 6)
|
||||||
rails-settings-cached (0.6.6)
|
rails-settings-cached (0.6.6)
|
||||||
rails (>= 4.2.0)
|
rails (>= 4.2.0)
|
||||||
railties (5.2.3)
|
railties (5.2.4)
|
||||||
actionpack (= 5.2.3)
|
actionpack (= 5.2.4)
|
||||||
activesupport (= 5.2.3)
|
activesupport (= 5.2.4)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
thor (>= 0.19.0, < 2.0)
|
thor (>= 0.19.0, < 2.0)
|
||||||
|
@ -667,9 +667,9 @@ GEM
|
||||||
webpush (0.3.8)
|
webpush (0.3.8)
|
||||||
hkdf (~> 0.2)
|
hkdf (~> 0.2)
|
||||||
jwt (~> 2.0)
|
jwt (~> 2.0)
|
||||||
websocket-driver (0.7.0)
|
websocket-driver (0.7.1)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.3)
|
websocket-extensions (0.1.4)
|
||||||
wisper (2.0.1)
|
wisper (2.0.1)
|
||||||
xpath (3.2.0)
|
xpath (3.2.0)
|
||||||
nokogiri (~> 1.8)
|
nokogiri (~> 1.8)
|
||||||
|
@ -767,7 +767,7 @@ DEPENDENCIES
|
||||||
pundit (~> 2.1)
|
pundit (~> 2.1)
|
||||||
rack-attack (~> 6.2)
|
rack-attack (~> 6.2)
|
||||||
rack-cors (~> 1.1)
|
rack-cors (~> 1.1)
|
||||||
rails (~> 5.2.3)
|
rails (~> 5.2.4)
|
||||||
rails-controller-testing (~> 1.0)
|
rails-controller-testing (~> 1.0)
|
||||||
rails-i18n (~> 5.1)
|
rails-i18n (~> 5.1)
|
||||||
rails-settings-cached (~> 0.6)
|
rails-settings-cached (~> 0.6)
|
||||||
|
@ -789,6 +789,7 @@ DEPENDENCIES
|
||||||
simple-navigation (~> 4.1)
|
simple-navigation (~> 4.1)
|
||||||
simple_form (~> 5.0)
|
simple_form (~> 5.0)
|
||||||
simplecov (~> 0.17)
|
simplecov (~> 0.17)
|
||||||
|
sprockets (~> 3.7)
|
||||||
sprockets-rails (~> 3.2)
|
sprockets-rails (~> 3.2)
|
||||||
stackprof
|
stackprof
|
||||||
stoplight (~> 2.2.0)
|
stoplight (~> 2.2.0)
|
||||||
|
|
Loading…
Reference in a new issue