diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index b61336e57c1..046e403397a 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -2290,6 +2290,7 @@ rules: - <<: *if-merge-request changes: ["**/*click_house*"] + - <<: *if-merge-request-labels-run-all-rspec ######################### # Static analysis rules # diff --git a/.rubocop_todo/style/redundant_freeze.yml b/.rubocop_todo/style/redundant_freeze.yml index a637a2dc28f..12c9200bf54 100644 --- a/.rubocop_todo/style/redundant_freeze.yml +++ b/.rubocop_todo/style/redundant_freeze.yml @@ -2,54 +2,6 @@ # Cop supports --autocorrect. Style/RedundantFreeze: Exclude: - - 'app/controllers/help_controller.rb' - - 'app/controllers/import/bitbucket_server_controller.rb' - - 'app/finders/issuable_finder.rb' - - 'app/finders/repositories/changelog_commits_finder.rb' - - 'app/helpers/auth_helper.rb' - - 'app/helpers/colors_helper.rb' - - 'app/helpers/sidekiq_helper.rb' - - 'app/models/application_setting_implementation.rb' - - 'app/models/badge.rb' - - 'app/models/blob_viewer/go_mod.rb' - - 'app/models/ci/runner.rb' - - 'app/models/commit.rb' - - 'app/models/commit_range.rb' - - 'app/models/concerns/ci/maskable.rb' - - 'app/models/concerns/pg_full_text_searchable.rb' - - 'app/models/concerns/redactable.rb' - - 'app/models/concerns/taskable.rb' - - 'app/models/custom_emoji.rb' - - 'app/models/environment_status.rb' - - 'app/models/error_tracking/project_error_tracking_setting.rb' - - 'app/models/hooks/web_hook.rb' - - 'app/models/integrations/apple_app_store.rb' - - 'app/models/integrations/chat_message/base_message.rb' - - 'app/models/integrations/confluence.rb' - - 'app/models/integrations/datadog.rb' - - 'app/models/integrations/discord.rb' - - 'app/models/integrations/teamcity.rb' - - 'app/models/license_template.rb' - - 'app/models/members/group_member.rb' - - 'app/models/members/project_member.rb' - - 'app/models/merge_request.rb' - - 'app/models/namespaces/randomized_suffix_path.rb' - - 'app/models/note.rb' - - 'app/models/packages/debian.rb' - - 'app/models/packages/debian/file_entry.rb' - - 'app/models/personal_access_token.rb' - - 'app/models/releases/link.rb' - - 'app/models/snippet_repository.rb' - - 'app/models/terraform/state.rb' - - 'app/services/clusters/agent_tokens/track_usage_service.rb' - - 'app/services/import/validate_remote_git_endpoint_service.rb' - - 'app/services/issues/base_service.rb' - - 'app/services/projects/import_error_filter.rb' - - 'app/services/projects/lfs_pointers/lfs_object_download_list_service.rb' - - 'app/uploaders/file_uploader.rb' - - 'app/validators/certificate_fingerprint_validator.rb' - - 'app/validators/json_schema_validator.rb' - - 'app/validators/line_code_validator.rb' - 'lib/api/api.rb' - 'lib/api/debian_group_packages.rb' - 'lib/api/go_proxy.rb' diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 3eedc2dac46..9e8cbaab078 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -f1d2afbee25a73855d931ad2d406e04e2062dc96 +5688f0d78dfb631f600868b80e8bfa9f13834f65 diff --git a/Gemfile b/Gemfile index b116ea0345c..111131e04ff 100644 --- a/Gemfile +++ b/Gemfile @@ -496,7 +496,7 @@ group :test do gem 'gitlab_quality-test_tooling', '~> 0.9.3', require: false end -gem 'octokit', '~> 4.15' +gem 'octokit', '~> 6.0' gem 'gitlab-mail_room', '~> 0.0.23', require: 'mail_room' diff --git a/Gemfile.checksum b/Gemfile.checksum index 8bd050f828d..4bd3126c7d1 100644 --- a/Gemfile.checksum +++ b/Gemfile.checksum @@ -96,7 +96,7 @@ {"name":"crystalball","version":"0.7.0","platform":"ruby","checksum":"6e729f372a5071daec877adb40c5df4cb25fe21f350635e2a9624373fc151ef2"}, {"name":"css_parser","version":"1.14.0","platform":"ruby","checksum":"f2ce6148cd505297b07bdbe7a5db4cce5cf530071f9b732b9a23538d6cdc0113"}, {"name":"cvss-suite","version":"3.0.1","platform":"ruby","checksum":"b5ca9e9e94032a42fd0dc28c1e305378b62c949e35ed7111fc4a1d76f68ad3f9"}, -{"name":"danger","version":"8.6.1","platform":"ruby","checksum":"d95eb58b41f68d3aaa9bbef697916b6b4d161a38819517c98562531be75cdfd8"}, +{"name":"danger","version":"9.3.1","platform":"ruby","checksum":"9070fbac181eb45fb9b69ea25e6ea4faa86796ef33bf8d00346cab4385e51df5"}, {"name":"danger-gitlab","version":"8.0.0","platform":"ruby","checksum":"497dd7d0f6513913de651019223d8058cf494df10acbd17de92b175dfa04a3a8"}, {"name":"database_cleaner","version":"1.7.0","platform":"ruby","checksum":"bdf833c197afac7054015bcde2567c3834c366bbfe6a377c30151ca984b32016"}, {"name":"date","version":"3.3.3","platform":"java","checksum":"584e0a582d1eb2207b4eaac089d8a43f2ca10bea02682f286099642f15c56cce"}, @@ -204,7 +204,7 @@ {"name":"gettext","version":"3.3.6","platform":"ruby","checksum":"ee6bbd1b2f833ee52d7797fa68acbfecc4726aec6b6280fd7eab92aa0190b413"}, {"name":"gettext_i18n_rails","version":"1.11.0","platform":"ruby","checksum":"e19c7e4a256c500f7f38396dca44a282b9838ae278f57c362993a54964b22bbe"}, {"name":"gettext_i18n_rails_js","version":"1.3.0","platform":"ruby","checksum":"5d10afe4be3639bff78c50a56768c20f39aecdabc580c08aa45573911c2bd687"}, -{"name":"git","version":"1.11.0","platform":"ruby","checksum":"7e95ba4da8298a0373ef1a6862aa22007d761f3c8274b675aa787966fecea0f1"}, +{"name":"git","version":"1.18.0","platform":"ruby","checksum":"c9b80462e4565cd3d7a9ba8440c41d2c52244b17b0dad0bfddb46de70630c465"}, {"name":"gitaly","version":"16.3.0.pre.rc1","platform":"ruby","checksum":"55d9cc414a4f3859588f3770bd88d7c67c0f5454a1178b018b7a6f6913674c43"}, {"name":"gitlab","version":"4.19.0","platform":"ruby","checksum":"3f645e3e195dbc24f0834fbf83e8ccfb2056d8e9712b01a640aad418a6949679"}, {"name":"gitlab-chronic","version":"0.10.5","platform":"ruby","checksum":"f80f18dc699b708870a80685243331290bc10cfeedb6b99c92219722f729c875"}, @@ -406,7 +406,7 @@ {"name":"numerizer","version":"0.2.0","platform":"ruby","checksum":"e58076d5ee5370417b7e52d9cb25836d62acd1b8d9a194c308707986c1705d7b"}, {"name":"oauth","version":"0.5.6","platform":"ruby","checksum":"4085fe28e0c5e2434135e00a6555294fd2a4ff96a98d1bdecdcd619fc6368dff"}, {"name":"oauth2","version":"2.0.9","platform":"ruby","checksum":"b21f9defcf52dc1610e0dfab4c868342173dcd707fd15c777d9f4f04e153f7fb"}, -{"name":"octokit","version":"4.25.1","platform":"ruby","checksum":"c02092ee82dcdfe84db0e0ea630a70d32becc54245a4f0bacfd21c010df09b96"}, +{"name":"octokit","version":"6.1.1","platform":"ruby","checksum":"920e4a9d820205f70738f58de6a7e6ef0e2f25b27db954b5806a63105207b0bf"}, {"name":"ohai","version":"17.9.0","platform":"ruby","checksum":"c59cf16124c0a6481fb85013ec7ec5b398651b6abed782d3e06ab058ce9a5406"}, {"name":"oj","version":"3.13.23","platform":"ruby","checksum":"206dfdc4020ad9974705037f269cfba211d61b7662a58c717cce771829ccef51"}, {"name":"oj-introspect","version":"0.7.2","platform":"ruby","checksum":"c415a44567ed2870d8e963a69421d9322128e194fab7867e37e54d5a25d5333d"}, diff --git a/Gemfile.lock b/Gemfile.lock index c3bccda1433..ee916862c50 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -389,18 +389,18 @@ GEM css_parser (1.14.0) addressable cvss-suite (3.0.1) - danger (8.6.1) + danger (9.3.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (>= 0.9.0, < 2.0) + faraday (>= 0.9.0, < 3.0) faraday-http-cache (~> 2.0) - git (~> 1.7) + git (~> 1.13) kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix - octokit (~> 4.7) + octokit (~> 6.0) terminal-table (>= 1, < 4) danger-gitlab (8.0.0) danger @@ -634,7 +634,8 @@ GEM gettext_i18n_rails (>= 0.7.1) po_to_json (>= 1.0.0) rails (>= 3.2.0) - git (1.11.0) + git (1.18.0) + addressable (~> 2.8) rchardet (~> 1.8) gitaly (16.3.0.pre.rc1) grpc (~> 1.0) @@ -1074,7 +1075,7 @@ GEM rack (>= 1.2, < 4) snaky_hash (~> 2.0) version_gem (~> 1.1) - octokit (4.25.1) + octokit (6.1.1) faraday (>= 1, < 3) sawyer (~> 0.9) ohai (17.9.0) @@ -1911,7 +1912,7 @@ DEPENDENCIES net-protocol (~> 0.1.3) nokogiri (~> 1.15, >= 1.15.4) oauth2 (~> 2.0) - octokit (~> 4.15) + octokit (~> 6.0) ohai (~> 17.9) oj (~> 3.13.21) oj-introspect (~> 0.7) diff --git a/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js b/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js index c4cc6939121..da09852a7f4 100644 --- a/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js +++ b/app/assets/javascripts/ci/pipeline_details/pipeline_details_bundle.js @@ -33,10 +33,16 @@ export default async function initPipelineDetailsBundle() { if (tabsEl) { const { dataset } = tabsEl; + const dismissalDescriptions = JSON.parse(dataset.dismissalDescriptions || '{}'); const { createAppOptions } = await import('ee_else_ce/ci/pipeline_details/pipeline_tabs'); const { createPipelineTabs } = await import('./pipeline_tabs'); const { routes } = await import('ee_else_ce/ci/pipeline_details/routes'); + const securityRoute = routes.find((route) => route.path === '/security'); + if (securityRoute) { + securityRoute.props = { dismissalDescriptions }; + } + const router = new VueRouter({ mode: 'history', base: dataset.pipelinePath, diff --git a/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue b/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue index da165413341..20b42e26f08 100644 --- a/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue +++ b/app/assets/javascripts/ci/pipeline_editor/components/file_nav/pipeline_editor_file_nav.vue @@ -52,7 +52,7 @@ export default { };