diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml index 4a293577fc0..584464d26a4 100644 --- a/.rubocop_todo/layout/space_in_lambda_literal.yml +++ b/.rubocop_todo/layout/space_in_lambda_literal.yml @@ -2,17 +2,6 @@ # Cop supports --autocorrect. Layout/SpaceInLambdaLiteral: Exclude: - - 'ee/app/serializers/blocking_merge_request_entity.rb' - - 'ee/app/serializers/clusters/environment_entity.rb' - - 'ee/app/serializers/dashboard_operations_project_entity.rb' - - 'ee/app/serializers/ee/blob_entity.rb' - - 'ee/app/serializers/ee/environment_entity.rb' - - 'ee/app/serializers/ee/evidences/release_entity.rb' - - 'ee/app/serializers/ee/issue_entity.rb' - - 'ee/app/serializers/ee/issue_sidebar_basic_entity.rb' - - 'ee/app/serializers/ee/issue_sidebar_extras_entity.rb' - - 'ee/app/serializers/ee/merge_request_poll_cached_widget_entity.rb' - - 'ee/app/serializers/ee/merge_request_widget_entity.rb' - 'ee/app/serializers/ee/note_entity.rb' - 'ee/app/serializers/epic_base_entity.rb' - 'ee/app/serializers/epic_entity.rb' diff --git a/Gemfile b/Gemfile index b4e5a5eadc4..602a4a9040a 100644 --- a/Gemfile +++ b/Gemfile @@ -208,7 +208,7 @@ gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentati gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-core', '~> 3.197.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.151.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.152.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/Gemfile.checksum b/Gemfile.checksum index bb2783886e2..9524c854c7b 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -38,7 +38,7 @@ {"name":"aws-sdk-cloudformation","version":"1.41.0","platform":"ruby","checksum":"31e47539719734413671edf9b1a31f8673fbf9688549f50c41affabbcb1c6b26"}, {"name":"aws-sdk-core","version":"3.197.0","platform":"ruby","checksum":"34c44883d3cc91ada382f6ecab981a1b7ede9a1ec47cf8eb2eaa3ee46035db90"}, {"name":"aws-sdk-kms","version":"1.76.0","platform":"ruby","checksum":"e7f75013cba9ba357144f66bbc600631c192e2cda9dd572794be239654e2cf49"}, -{"name":"aws-sdk-s3","version":"1.151.0","platform":"ruby","checksum":"9e40e64f3ea112b33fdbb0416b6b44247372b983f6a7a9c30fa9b5627a4f7008"}, +{"name":"aws-sdk-s3","version":"1.152.0","platform":"ruby","checksum":"f502f292b691ea45db0b4ac8f04ff54ed5625d647340f93c7e1b4a91ea08d720"}, {"name":"aws-sigv4","version":"1.8.0","platform":"ruby","checksum":"84dd99768b91b93b63d1d8e53ee837cfd06ab402812772a7899a78f9f9117cbc"}, {"name":"axe-core-api","version":"4.8.0","platform":"ruby","checksum":"88cf44fdbd5d501ae429f9ca6b37c4a46ba27ac673d478ab688eea3e353da62f"}, {"name":"axe-core-rspec","version":"4.9.0","platform":"ruby","checksum":"e5f81fa55af0c421254c98476511c4511e193c5659996f184541f74a1359df3a"}, diff --git a/Gemfile.lock b/Gemfile.lock index 286a38c808f..cdac2783d72 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,8 +312,8 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.151.0) - aws-sdk-core (~> 3, >= 3.194.0) + aws-sdk-s3 (1.152.0) + aws-sdk-core (~> 3, >= 3.197.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) aws-sigv4 (1.8.0) @@ -1926,7 +1926,7 @@ DEPENDENCIES awesome_print aws-sdk-cloudformation (~> 1) aws-sdk-core (~> 3.197.0) - aws-sdk-s3 (~> 1.151.0) + aws-sdk-s3 (~> 1.152.0) axe-core-rspec (~> 4.9.0) babosa (~> 2.0) base32 (~> 0.3.0) diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue index 532dec337e1..ded04bd24d4 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue @@ -177,7 +177,7 @@ export default {