Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Upgrade Rails to 6.1.4.1. (#14098) 

This pulls in a fix for CVE-2021-22942 but we're not tagging it as a
security fix because Discourse is not affected by it in production.
This commit is contained in:
Alan Guo Xiang Tan 2021-08-20 10:20:08 +08:00 committed by GitHub
parent 70552a2d43
commit 16cfbed89d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Gemfile
View File

@ -18,13 +18,14 @@ else
# this allows us to include the bits of rails we use without pieces we do not. # this allows us to include the bits of rails we use without pieces we do not.
# #
# To issue a rails update bump the version number here # To issue a rails update bump the version number here
gem 'actionmailer', '6.1.3.2' rails_version = '6.1.4.1'
gem 'actionpack', '6.1.3.2' gem 'actionmailer', rails_version
gem 'actionview', '6.1.3.2' gem 'actionpack', rails_version
gem 'activemodel', '6.1.3.2' gem 'actionview', rails_version
gem 'activerecord', '6.1.3.2' gem 'activemodel', rails_version
gem 'activesupport', '6.1.3.2' gem 'activerecord', rails_version
gem 'railties', '6.1.3.2' gem 'activesupport', rails_version
gem 'railties', rails_version
gem 'sprockets-rails' gem 'sprockets-rails'
end end

58
Gemfile.lock
View File

@ -8,22 +8,22 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actionmailer (6.1.3.2) actionmailer (6.1.4.1)
actionpack (= 6.1.3.2) actionpack (= 6.1.4.1)
actionview (= 6.1.3.2) actionview (= 6.1.4.1)
activejob (= 6.1.3.2) activejob (= 6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.1.3.2) actionpack (6.1.4.1)
actionview (= 6.1.3.2) actionview (= 6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
rack (~> 2.0, >= 2.0.9) rack (~> 2.0, >= 2.0.9)
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.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionview (6.1.3.2) actionview (6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
@ -32,15 +32,15 @@ GEM
actionview (>= 6.0.a) actionview (>= 6.0.a)
active_model_serializers (0.8.4) active_model_serializers (0.8.4)
activemodel (>= 3.0) activemodel (>= 3.0)
activejob (6.1.3.2) activejob (6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.1.3.2) activemodel (6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
activerecord (6.1.3.2) activerecord (6.1.4.1)
activemodel (= 6.1.3.2) activemodel (= 6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
activesupport (6.1.3.2) activesupport (6.1.4.1)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -326,11 +326,11 @@ GEM
rails_multisite (3.0.0) rails_multisite (3.0.0)
activerecord (> 5.0, < 7) activerecord (> 5.0, < 7)
railties (> 5.0, < 7) railties (> 5.0, < 7)
railties (6.1.3.2) railties (6.1.4.1)
actionpack (= 6.1.3.2) actionpack (= 6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
method_source method_source
rake (>= 0.8.7) rake (>= 0.13)
thor (~> 1.0) thor (~> 1.0)
rainbow (3.0.0) rainbow (3.0.0)
raindrops (0.19.2) raindrops (0.19.2)
@ -481,14 +481,14 @@ PLATFORMS
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES
actionmailer (= 6.1.3.2) actionmailer (= 6.1.4.1)
actionpack (= 6.1.3.2) actionpack (= 6.1.4.1)
actionview (= 6.1.3.2) actionview (= 6.1.4.1)
actionview_precompiler actionview_precompiler
active_model_serializers (~> 0.8.3) active_model_serializers (~> 0.8.3)
activemodel (= 6.1.3.2) activemodel (= 6.1.4.1)
activerecord (= 6.1.3.2) activerecord (= 6.1.4.1)
activesupport (= 6.1.3.2) activesupport (= 6.1.4.1)
addressable addressable
annotate annotate
aws-sdk-s3 aws-sdk-s3
@ -568,7 +568,7 @@ DEPENDENCIES
rack-protection rack-protection
rails_failover rails_failover
rails_multisite rails_multisite
railties (= 6.1.3.2) railties (= 6.1.4.1)
rake rake
rb-fsevent rb-fsevent
rbtrace rbtrace