Skip to content
代码片段 群组 项目
未验证 提交 4d958dae 编辑于 作者: GitLab Dependency Bot's avatar GitLab Dependency Bot 提交者: GitLab
浏览文件

Update dependency rubocop to v1.68.0

上级 ccd7b6ec
No related branches found
No related tags found
无相关合并请求
...@@ -4,12 +4,18 @@ Style/MapIntoArray: ...@@ -4,12 +4,18 @@ Style/MapIntoArray:
Exclude: Exclude:
- 'app/finders/projects/members/effective_access_level_finder.rb' - 'app/finders/projects/members/effective_access_level_finder.rb'
- 'app/services/packages/nuget/extract_metadata_content_service.rb' - 'app/services/packages/nuget/extract_metadata_content_service.rb'
- 'app/services/snippets/base_service.rb'
- 'config/settings.rb' - 'config/settings.rb'
- 'ee/app/workers/product_analytics/move_funnels_worker.rb'
- 'ee/lib/elastic/latest/user_class_proxy.rb'
- 'ee/lib/gitlab/search/zoekt/client.rb'
- 'ee/spec/lib/search/elastic/references/embedding_spec.rb' - 'ee/spec/lib/search/elastic/references/embedding_spec.rb'
- 'lib/gitlab/database/query_analyzers/prevent_set_operator_mismatch/node.rb' - 'lib/gitlab/database/query_analyzers/prevent_set_operator_mismatch/node.rb'
- 'lib/gitlab/git/blame.rb' - 'lib/gitlab/git/blame.rb'
- 'lib/gitlab/grape_logging/loggers/exception_logger.rb' - 'lib/gitlab/grape_logging/loggers/exception_logger.rb'
- 'lib/google_api/cloud_platform/client.rb' - 'lib/google_api/cloud_platform/client.rb'
- 'qa/qa/tools/delete_user_projects.rb' - 'qa/qa/tools/delete_user_projects.rb'
- 'qa/qa/tools/generate_perf_testdata.rb'
- 'spec/lib/gitlab/color_schemes_spec.rb' - 'spec/lib/gitlab/color_schemes_spec.rb'
- 'spec/lib/gitlab/git/blame_spec.rb'
- 'spec/lib/gitlab/themes_spec.rb' - 'spec/lib/gitlab/themes_spec.rb'
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
{"name":"gitlab-net-dns","version":"0.9.2","platform":"ruby","checksum":"f726d978479d43810819f12a45c0906d775a07e34df111bbe693fffbbef3059d"}, {"name":"gitlab-net-dns","version":"0.9.2","platform":"ruby","checksum":"f726d978479d43810819f12a45c0906d775a07e34df111bbe693fffbbef3059d"},
{"name":"gitlab-sdk","version":"0.3.1","platform":"ruby","checksum":"48ba49084f4ab92df7c7ef9f347020d9dfdf6ed9c1e782b67264e98ffe6ea710"}, {"name":"gitlab-sdk","version":"0.3.1","platform":"ruby","checksum":"48ba49084f4ab92df7c7ef9f347020d9dfdf6ed9c1e782b67264e98ffe6ea710"},
{"name":"gitlab-security_report_schemas","version":"0.1.2.min15.0.0.max15.2.1","platform":"ruby","checksum":"300037487ec9d51a814f648514ff521cb82b94fc51d9fe53389175b36ac680ae"}, {"name":"gitlab-security_report_schemas","version":"0.1.2.min15.0.0.max15.2.1","platform":"ruby","checksum":"300037487ec9d51a814f648514ff521cb82b94fc51d9fe53389175b36ac680ae"},
{"name":"gitlab-styles","version":"13.0.1","platform":"ruby","checksum":"bf1840fe97b215ab76fe1f1a83af0aee30d33ded905415918462b832004b68bd"}, {"name":"gitlab-styles","version":"13.0.2","platform":"ruby","checksum":"e662b9334643763b55a861f9e26091096547f98179bd89b0fa8d6c6fb8cec861"},
{"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"}, {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"},
{"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"}, {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
{"name":"gitlab_quality-test_tooling","version":"2.2.0","platform":"ruby","checksum":"d8fdaa7e5b529d0157485db4c81876a492303b53f30d9e8246f91f37f689295a"}, {"name":"gitlab_quality-test_tooling","version":"2.2.0","platform":"ruby","checksum":"d8fdaa7e5b529d0157485db4c81876a492303b53f30d9e8246f91f37f689295a"},
...@@ -610,7 +610,7 @@ ...@@ -610,7 +610,7 @@
{"name":"rspec-support","version":"3.13.1","platform":"ruby","checksum":"48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f"}, {"name":"rspec-support","version":"3.13.1","platform":"ruby","checksum":"48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f"},
{"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"}, {"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"},
{"name":"rspec_profiling","version":"0.0.9","platform":"ruby","checksum":"6199be2daeaa14bac3d10d704dbb0a8df052cf046332c505603263aea24f7590"}, {"name":"rspec_profiling","version":"0.0.9","platform":"ruby","checksum":"6199be2daeaa14bac3d10d704dbb0a8df052cf046332c505603263aea24f7590"},
{"name":"rubocop","version":"1.67.0","platform":"ruby","checksum":"8ccca7226e76d0a9974af960ea446d1fb38adf0c491214294e2fed75a85c378c"}, {"name":"rubocop","version":"1.68.0","platform":"ruby","checksum":"07df508504d81e97174e8d21030f25d52c1be7ee8615939db43f3b377ea6c12b"},
{"name":"rubocop-ast","version":"1.32.3","platform":"ruby","checksum":"40201e861c73a3c2d59428c7627828ef81fb2f8a306bc4a1c1801452afe3fe0f"}, {"name":"rubocop-ast","version":"1.32.3","platform":"ruby","checksum":"40201e861c73a3c2d59428c7627828ef81fb2f8a306bc4a1c1801452afe3fe0f"},
{"name":"rubocop-capybara","version":"2.21.0","platform":"ruby","checksum":"5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab"}, {"name":"rubocop-capybara","version":"2.21.0","platform":"ruby","checksum":"5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab"},
{"name":"rubocop-factory_bot","version":"2.26.1","platform":"ruby","checksum":"8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa"}, {"name":"rubocop-factory_bot","version":"2.26.1","platform":"ruby","checksum":"8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa"},
......
...@@ -777,8 +777,8 @@ GEM ...@@ -777,8 +777,8 @@ GEM
gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1)
activesupport (>= 6, < 8) activesupport (>= 6, < 8)
json_schemer (~> 2.3.0) json_schemer (~> 2.3.0)
gitlab-styles (13.0.1) gitlab-styles (13.0.2)
rubocop (~> 1.67.0) rubocop (~> 1.68.0)
rubocop-capybara (~> 2.21.0) rubocop-capybara (~> 2.21.0)
rubocop-factory_bot (~> 2.26.1) rubocop-factory_bot (~> 2.26.1)
rubocop-graphql (~> 1.5.4) rubocop-graphql (~> 1.5.4)
...@@ -1636,7 +1636,7 @@ GEM ...@@ -1636,7 +1636,7 @@ GEM
activerecord activerecord
get_process_mem get_process_mem
rails rails
rubocop (1.67.0) rubocop (1.68.0)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
......
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
{"name":"gitlab-net-dns","version":"0.9.2","platform":"ruby","checksum":"f726d978479d43810819f12a45c0906d775a07e34df111bbe693fffbbef3059d"}, {"name":"gitlab-net-dns","version":"0.9.2","platform":"ruby","checksum":"f726d978479d43810819f12a45c0906d775a07e34df111bbe693fffbbef3059d"},
{"name":"gitlab-sdk","version":"0.3.1","platform":"ruby","checksum":"48ba49084f4ab92df7c7ef9f347020d9dfdf6ed9c1e782b67264e98ffe6ea710"}, {"name":"gitlab-sdk","version":"0.3.1","platform":"ruby","checksum":"48ba49084f4ab92df7c7ef9f347020d9dfdf6ed9c1e782b67264e98ffe6ea710"},
{"name":"gitlab-security_report_schemas","version":"0.1.2.min15.0.0.max15.2.1","platform":"ruby","checksum":"300037487ec9d51a814f648514ff521cb82b94fc51d9fe53389175b36ac680ae"}, {"name":"gitlab-security_report_schemas","version":"0.1.2.min15.0.0.max15.2.1","platform":"ruby","checksum":"300037487ec9d51a814f648514ff521cb82b94fc51d9fe53389175b36ac680ae"},
{"name":"gitlab-styles","version":"13.0.1","platform":"ruby","checksum":"bf1840fe97b215ab76fe1f1a83af0aee30d33ded905415918462b832004b68bd"}, {"name":"gitlab-styles","version":"13.0.2","platform":"ruby","checksum":"e662b9334643763b55a861f9e26091096547f98179bd89b0fa8d6c6fb8cec861"},
{"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"}, {"name":"gitlab_chronic_duration","version":"0.12.0","platform":"ruby","checksum":"0d766944d415b5c831f176871ee8625783fc0c5bfbef2d79a3a616f207ffc16d"},
{"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"}, {"name":"gitlab_omniauth-ldap","version":"2.2.0","platform":"ruby","checksum":"bb4d20acb3b123ed654a8f6a47d3fac673ece7ed0b6992edb92dca14bad2838c"},
{"name":"gitlab_quality-test_tooling","version":"2.2.0","platform":"ruby","checksum":"d8fdaa7e5b529d0157485db4c81876a492303b53f30d9e8246f91f37f689295a"}, {"name":"gitlab_quality-test_tooling","version":"2.2.0","platform":"ruby","checksum":"d8fdaa7e5b529d0157485db4c81876a492303b53f30d9e8246f91f37f689295a"},
...@@ -620,7 +620,7 @@ ...@@ -620,7 +620,7 @@
{"name":"rspec-support","version":"3.13.1","platform":"ruby","checksum":"48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f"}, {"name":"rspec-support","version":"3.13.1","platform":"ruby","checksum":"48877d4f15b772b7538f3693c22225f2eda490ba65a0515c4e7cf6f2f17de70f"},
{"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"}, {"name":"rspec_junit_formatter","version":"0.6.0","platform":"ruby","checksum":"40dde674e6ae4e6cc0ff560da25497677e34fefd2338cc467a8972f602b62b15"},
{"name":"rspec_profiling","version":"0.0.9","platform":"ruby","checksum":"6199be2daeaa14bac3d10d704dbb0a8df052cf046332c505603263aea24f7590"}, {"name":"rspec_profiling","version":"0.0.9","platform":"ruby","checksum":"6199be2daeaa14bac3d10d704dbb0a8df052cf046332c505603263aea24f7590"},
{"name":"rubocop","version":"1.67.0","platform":"ruby","checksum":"8ccca7226e76d0a9974af960ea446d1fb38adf0c491214294e2fed75a85c378c"}, {"name":"rubocop","version":"1.68.0","platform":"ruby","checksum":"07df508504d81e97174e8d21030f25d52c1be7ee8615939db43f3b377ea6c12b"},
{"name":"rubocop-ast","version":"1.32.3","platform":"ruby","checksum":"40201e861c73a3c2d59428c7627828ef81fb2f8a306bc4a1c1801452afe3fe0f"}, {"name":"rubocop-ast","version":"1.32.3","platform":"ruby","checksum":"40201e861c73a3c2d59428c7627828ef81fb2f8a306bc4a1c1801452afe3fe0f"},
{"name":"rubocop-capybara","version":"2.21.0","platform":"ruby","checksum":"5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab"}, {"name":"rubocop-capybara","version":"2.21.0","platform":"ruby","checksum":"5d264efdd8b6c7081a3d4889decf1451a1cfaaec204d81534e236bc825b280ab"},
{"name":"rubocop-factory_bot","version":"2.26.1","platform":"ruby","checksum":"8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa"}, {"name":"rubocop-factory_bot","version":"2.26.1","platform":"ruby","checksum":"8de13cd4edcee5ca800f255188167ecef8dbfc3d1fae9f15734e9d2e755392aa"},
......
...@@ -787,8 +787,8 @@ GEM ...@@ -787,8 +787,8 @@ GEM
gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1) gitlab-security_report_schemas (0.1.2.min15.0.0.max15.2.1)
activesupport (>= 6, < 8) activesupport (>= 6, < 8)
json_schemer (~> 2.3.0) json_schemer (~> 2.3.0)
gitlab-styles (13.0.1) gitlab-styles (13.0.2)
rubocop (~> 1.67.0) rubocop (~> 1.68.0)
rubocop-capybara (~> 2.21.0) rubocop-capybara (~> 2.21.0)
rubocop-factory_bot (~> 2.26.1) rubocop-factory_bot (~> 2.26.1)
rubocop-graphql (~> 1.5.4) rubocop-graphql (~> 1.5.4)
...@@ -1662,7 +1662,7 @@ GEM ...@@ -1662,7 +1662,7 @@ GEM
activerecord activerecord
get_process_mem get_process_mem
rails rails
rubocop (1.67.0) rubocop (1.68.0)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
parallel (~> 1.10) parallel (~> 1.10)
......
...@@ -15,7 +15,6 @@ def self.enabled? ...@@ -15,7 +15,6 @@ def self.enabled?
# can't be referred to. # can't be referred to.
# #
# We do not need the custom command builder since Sidekiq will handle the typing of Redis arguments. # We do not need the custom command builder since Sidekiq will handle the typing of Redis arguments.
queues_config_hash = Gitlab::Redis::Queues.params.except(:command_builder)
queue_instance = ENV.fetch('SIDEKIQ_SHARD_NAME', Gitlab::Redis::Queues::SIDEKIQ_MAIN_SHARD_INSTANCE_NAME) queue_instance = ENV.fetch('SIDEKIQ_SHARD_NAME', Gitlab::Redis::Queues::SIDEKIQ_MAIN_SHARD_INSTANCE_NAME)
queues_config_hash = Gitlab::Redis::Queues.instances[queue_instance].params.except(:command_builder) queues_config_hash = Gitlab::Redis::Queues.instances[queue_instance].params.except(:command_builder)
......
...@@ -49,7 +49,7 @@ def restore_issue(issue) ...@@ -49,7 +49,7 @@ def restore_issue(issue)
parent = if Group.exists?(root_group[:id]) parent = if Group.exists?(root_group[:id])
Group.find(root_group[:id]) Group.find(root_group[:id])
else else
parent = create(:group_with_plan, id: root_group[:id], name: root_group[:name], path: root_group[:path], create(:group_with_plan, id: root_group[:id], name: root_group[:name], path: root_group[:path],
plan: :ultimate_plan) plan: :ultimate_plan)
end end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册