Commit 8e54d1f0 authored by Igor Drozdov's avatar Igor Drozdov

Bump rails gem version to 6.0.3.7

It contains multiple security fixes.

One of them prevents string polymorphic route arguments and
causes some additional changes to be made along with just bumping
gem version
parent 34af4653
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gem 'rails', '~> 6.0.3.6' gem 'rails', '~> 6.0.3.7'
gem 'bootsnap', '~> 1.4.6' gem 'bootsnap', '~> 1.4.6'
......
...@@ -12,59 +12,59 @@ GEM ...@@ -12,59 +12,59 @@ GEM
abstract_type (0.0.7) abstract_type (0.0.7)
acme-client (2.0.6) acme-client (2.0.6)
faraday (>= 0.17, < 2.0.0) faraday (>= 0.17, < 2.0.0)
actioncable (6.0.3.6) actioncable (6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (6.0.3.6) actionmailbox (6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
activejob (= 6.0.3.6) activejob (= 6.0.3.7)
activerecord (= 6.0.3.6) activerecord (= 6.0.3.7)
activestorage (= 6.0.3.6) activestorage (= 6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
mail (>= 2.7.1) mail (>= 2.7.1)
actionmailer (6.0.3.6) actionmailer (6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
actionview (= 6.0.3.6) actionview (= 6.0.3.7)
activejob (= 6.0.3.6) activejob (= 6.0.3.7)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (6.0.3.6) actionpack (6.0.3.7)
actionview (= 6.0.3.6) actionview (= 6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
rack (~> 2.0, >= 2.0.8) rack (~> 2.0, >= 2.0.8)
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)
actiontext (6.0.3.6) actiontext (6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
activerecord (= 6.0.3.6) activerecord (= 6.0.3.7)
activestorage (= 6.0.3.6) activestorage (= 6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (6.0.3.6) actionview (6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.3.6) activejob (6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (6.0.3.6) activemodel (6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
activerecord (6.0.3.6) activerecord (6.0.3.7)
activemodel (= 6.0.3.6) activemodel (= 6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
activerecord-explain-analyze (0.1.0) activerecord-explain-analyze (0.1.0)
activerecord (>= 4) activerecord (>= 4)
pg pg
activestorage (6.0.3.6) activestorage (6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
activejob (= 6.0.3.6) activejob (= 6.0.3.7)
activerecord (= 6.0.3.6) activerecord (= 6.0.3.7)
marcel (~> 1.0.0) marcel (~> 1.0.0)
activesupport (6.0.3.6) activesupport (6.0.3.7)
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)
...@@ -963,20 +963,20 @@ GEM ...@@ -963,20 +963,20 @@ GEM
rack-test (1.1.0) rack-test (1.1.0)
rack (>= 1.0, < 3) rack (>= 1.0, < 3)
rack-timeout (0.5.2) rack-timeout (0.5.2)
rails (6.0.3.6) rails (6.0.3.7)
actioncable (= 6.0.3.6) actioncable (= 6.0.3.7)
actionmailbox (= 6.0.3.6) actionmailbox (= 6.0.3.7)
actionmailer (= 6.0.3.6) actionmailer (= 6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
actiontext (= 6.0.3.6) actiontext (= 6.0.3.7)
actionview (= 6.0.3.6) actionview (= 6.0.3.7)
activejob (= 6.0.3.6) activejob (= 6.0.3.7)
activemodel (= 6.0.3.6) activemodel (= 6.0.3.7)
activerecord (= 6.0.3.6) activerecord (= 6.0.3.7)
activestorage (= 6.0.3.6) activestorage (= 6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
bundler (>= 1.3.0) bundler (>= 1.3.0)
railties (= 6.0.3.6) railties (= 6.0.3.7)
sprockets-rails (>= 2.0.0) sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5) rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1) actionpack (>= 5.0.1.rc1)
...@@ -990,9 +990,9 @@ GEM ...@@ -990,9 +990,9 @@ GEM
rails-i18n (6.0.0) rails-i18n (6.0.0)
i18n (>= 0.7, < 2) i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7) railties (>= 6.0.0, < 7)
railties (6.0.3.6) railties (6.0.3.7)
actionpack (= 6.0.3.6) actionpack (= 6.0.3.7)
activesupport (= 6.0.3.6) activesupport (= 6.0.3.7)
method_source method_source
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0) thor (>= 0.20.3, < 2.0)
...@@ -1588,7 +1588,7 @@ DEPENDENCIES ...@@ -1588,7 +1588,7 @@ DEPENDENCIES
rack-oauth2 (~> 1.16.0) rack-oauth2 (~> 1.16.0)
rack-proxy (~> 0.6.0) rack-proxy (~> 0.6.0)
rack-timeout (~> 0.5.1) rack-timeout (~> 0.5.1)
rails (~> 6.0.3.6) rails (~> 6.0.3.7)
rails-controller-testing rails-controller-testing
rails-i18n (~> 6.0) rails-i18n (~> 6.0)
rainbow (~> 3.0) rainbow (~> 3.0)
......
...@@ -108,7 +108,7 @@ module MembershipActions ...@@ -108,7 +108,7 @@ module MembershipActions
respond_to do |format| respond_to do |format|
format.html do format.html do
redirect_path = member.request? ? member.source : [:dashboard, membershipable.class.to_s.tableize] redirect_path = member.request? ? member.source : [:dashboard, membershipable.class.to_s.tableize.to_sym]
redirect_to redirect_path, notice: notice redirect_to redirect_path, notice: notice
end end
......
- add_page_specific_style 'page_bundles/import' - add_page_specific_style 'page_bundles/import'
- provider = local_assigns.fetch(:provider) - provider = local_assigns.fetch(:provider).to_sym
- extra_data = local_assigns.fetch(:extra_data, {}) - extra_data = local_assigns.fetch(:extra_data, {})
- filterable = local_assigns.fetch(:filterable, true) - filterable = local_assigns.fetch(:filterable, true)
- paginatable = local_assigns.fetch(:paginatable, false) - paginatable = local_assigns.fetch(:paginatable, false)
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- labels = issuable.labels - labels = issuable.labels
- assignees = issuable.assignees - assignees = issuable.assignees
- base_url_args = [project] - base_url_args = [project]
- issuable_type_args = base_url_args + [issuable.class.table_name] - issuable_type_args = base_url_args + [issuable.class.table_name.to_sym]
- issuable_url_args = base_url_args + [issuable] - issuable_url_args = base_url_args + [issuable]
%li.issuable-row %li.issuable-row
......
...@@ -55,9 +55,9 @@ module DeprecationToolkitEnv ...@@ -55,9 +55,9 @@ module DeprecationToolkitEnv
# one by one # one by one
def self.allowed_kwarg_warning_paths def self.allowed_kwarg_warning_paths
%w[ %w[
activerecord-6.0.3.6/lib/active_record/migration.rb activerecord-6.0.3.7/lib/active_record/migration.rb
activesupport-6.0.3.6/lib/active_support/cache.rb activesupport-6.0.3.7/lib/active_support/cache.rb
activerecord-6.0.3.6/lib/active_record/relation.rb activerecord-6.0.3.7/lib/active_record/relation.rb
asciidoctor-2.0.12/lib/asciidoctor/extensions.rb asciidoctor-2.0.12/lib/asciidoctor/extensions.rb
attr_encrypted-3.1.0/lib/attr_encrypted/adapters/active_record.rb attr_encrypted-3.1.0/lib/attr_encrypted/adapters/active_record.rb
] ]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment