From 885275c832d7c76b7290b38190a6cf31438d3898 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 15 Mar 2023 21:14:36 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab-ci.yml | 16 ++-- GITALY_SERVER_VERSION | 2 +- .../header_search/store/getters.js | 10 +- .../components/import_actions_cell.vue | 25 +---- .../import_groups/components/import_table.vue | 18 +--- .../components/related_merge_requests.vue | 14 +-- .../components/details_page/tags_list.vue | 7 +- .../components/details_page/tags_list_row.vue | 9 +- ...et_container_repository_tags.query.graphql | 1 + .../details/package_versions_list.vue | 5 +- .../shared/components/registry_list.vue | 2 +- app/helpers/search_helper.rb | 4 +- app/models/concerns/has_user_type.rb | 2 + .../application_settings/_realtime.html.haml | 4 +- app/views/devise/confirmations/new.html.haml | 5 +- .../projects/feature_flags/index.html.haml | 2 +- .../projects/pages/_pages_settings.html.haml | 2 +- .../registrations/welcome/show.html.haml | 3 +- .../development/cache_client_with_metrics.yml | 8 -- ...4623_schedule_migration_for_remediation.rb | 11 +-- ...alize_ci_build_needs_big_int_conversion.rb | 8 ++ ...lumns_ci_build_needs_big_int_conversion.rb | 57 +++++++++++ ...071242_delete_security_policy_bot_users.rb | 21 ++++ ...31_reschedule_migration_for_remediation.rb | 32 +++++++ db/schema_migrations/20230220102212 | 1 + db/schema_migrations/20230309071242 | 1 + db/schema_migrations/20230313150531 | 1 + db/structure.sql | 4 +- doc/.vale/gitlab/CodeblockFences.yml | 4 +- doc/.vale/gitlab/Substitutions.yml | 1 + doc/administration/gitaly/troubleshooting.md | 2 +- doc/administration/pages/index.md | 2 +- doc/api/license.md | 32 +++++++ .../metrics/index.md | 4 +- .../blueprints/object_storage/index.md | 2 +- .../blueprints/rate_limiting/index.md | 2 +- doc/ci/examples/index.md | 2 +- doc/ci/testing/test_coverage_visualization.md | 2 +- .../gitaly_touch_points.md | 2 +- .../backend/create_source_code_be/index.md | 2 +- .../documentation/styleguide/word_list.md | 9 +- doc/development/fips_compliance.md | 2 +- doc/development/gitaly.md | 8 +- doc/development/gitlab_shell/index.md | 4 +- doc/development/go_guide/go_upgrade.md | 2 +- doc/development/go_guide/index.md | 10 +- doc/development/secure_coding_guidelines.md | 32 +++---- .../uploads/working_with_uploads.md | 2 +- .../advanced_search/elasticsearch.md | 4 +- doc/operations/feature_flags.md | 6 +- .../coverage_fuzzing/index.md | 2 +- .../reduce_container_registry_storage.md | 2 +- doc/user/packages/go_proxy/index.md | 2 +- .../img/saved_replies_dropdown_v15_10.png | Bin 0 -> 23623 bytes doc/user/profile/saved_replies.md | 61 ++++++++++++ lib/api/files.rb | 14 +-- ...remediations_for_vulnerability_findings.rb | 2 +- locale/gitlab.pot | 3 - package.json | 2 +- .../header_search/store/getters_spec.js | 7 ++ .../components/import_actions_cell_spec.js | 39 ++++---- .../components/import_table_spec.js | 46 ++++----- .../details_page/tags_list_row_spec.js | 36 +++---- .../components/details_page/tags_list_spec.js | 24 +++-- .../container_registry/explorer/mock_data.js | 3 +- .../shared/components/registry_list_spec.js | 17 +++- spec/helpers/search_helper_spec.rb | 15 +++ ...iations_for_vulnerability_findings_spec.rb | 12 +++ ...schedule_migration_for_remediation_spec.rb | 8 +- ..._ci_build_needs_big_int_conversion_spec.rb | 43 +++++++++ ..._ci_build_needs_big_int_conversion_spec.rb | 60 ++++++++++++ ...2_delete_security_policy_bot_users_spec.rb | 24 +++++ ...schedule_migration_for_remediation_spec.rb | 31 ++++++ spec/models/concerns/has_user_type_spec.rb | 2 +- spec/requests/api/files_spec.rb | 21 ---- .../api/issues/get_group_issues_spec.rb | 30 +++--- .../api/issues/get_project_issues_spec.rb | 42 ++++---- spec/requests/api/issues/issues_spec.rb | 60 ++++++------ .../api/issues/post_projects_issues_spec.rb | 90 +++++++++--------- .../api/issues/put_projects_issues_spec.rb | 62 ++++++------ .../api/pages/internal_access_spec.rb | 68 ++++++------- spec/requests/api/pages/pages_spec.rb | 12 +-- .../requests/api/pages/private_access_spec.rb | 68 ++++++------- spec/requests/api/pages/public_access_spec.rb | 68 ++++++------- spec/requests/api/pages_domains_spec.rb | 40 ++++---- spec/spec_helper.rb | 10 -- yarn.lock | 8 +- 87 files changed, 893 insertions(+), 552 deletions(-) delete mode 100644 config/feature_flags/development/cache_client_with_metrics.yml create mode 100644 db/post_migrate/20230220102212_swap_columns_ci_build_needs_big_int_conversion.rb create mode 100644 db/post_migrate/20230309071242_delete_security_policy_bot_users.rb create mode 100644 db/post_migrate/20230313150531_reschedule_migration_for_remediation.rb create mode 100644 db/schema_migrations/20230220102212 create mode 100644 db/schema_migrations/20230309071242 create mode 100644 db/schema_migrations/20230313150531 create mode 100644 doc/user/profile/img/saved_replies_dropdown_v15_10.png create mode 100644 doc/user/profile/saved_replies.md create mode 100644 spec/migrations/20230214181633_finalize_ci_build_needs_big_int_conversion_spec.rb create mode 100644 spec/migrations/20230220102212_swap_columns_ci_build_needs_big_int_conversion_spec.rb create mode 100644 spec/migrations/20230309071242_delete_security_policy_bot_users_spec.rb create mode 100644 spec/migrations/20230313150531_reschedule_migration_for_remediation_spec.rb diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 79f99211bb1..c3087716b13 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,28 +106,28 @@ workflow: # For tags, create a pipeline. - if: '$CI_COMMIT_TAG' variables: - <<: *ruby2-variables - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_TAG tag pipeline' + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_TAG tag pipeline' # If `$GITLAB_INTERNAL` isn't set, don't create a pipeline. - if: '$GITLAB_INTERNAL == null' when: never # For stable, auto-deploy, and security branches, create a pipeline. - if: '$CI_COMMIT_BRANCH =~ /^[\d-]+-stable(-ee)?$/' variables: - <<: *ruby2-variables + <<: *ruby3-variables NOTIFY_PIPELINE_FAILURE_CHANNEL: "releases" - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' CREATE_INCIDENT_FOR_PIPELINE_FAILURE: "true" BROKEN_BRANCH_INCIDENTS_PROJECT: "gitlab-org/release/tasks" BROKEN_BRANCH_INCIDENTS_PROJECT_TOKEN: "${BROKEN_STABLE_INCIDENTS_PROJECT_TOKEN}" - if: '$CI_COMMIT_BRANCH =~ /^\d+-\d+-auto-deploy-\d+$/' variables: - <<: *ruby2-variables - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' - if: '$CI_COMMIT_BRANCH =~ /^security\//' variables: - <<: *ruby2-variables - PIPELINE_NAME: 'Ruby 2 $CI_COMMIT_BRANCH branch pipeline' + <<: *ruby3-variables + PIPELINE_NAME: 'Ruby 3 $CI_COMMIT_BRANCH branch pipeline' variables: PG_VERSION: "12" diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index 2d5269488e5..97fadac1f9d 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -71dbaa115c10ae08292a7df74d3f8297ab38f208 +705e00092a936f0233fe16339aba3a1c65db36b0 diff --git a/app/assets/javascripts/header_search/store/getters.js b/app/assets/javascripts/header_search/store/getters.js index 3da9d2cd961..3dec857930d 100644 --- a/app/assets/javascripts/header_search/store/getters.js +++ b/app/assets/javascripts/header_search/store/getters.js @@ -36,6 +36,10 @@ export const searchQuery = (state) => { }; export const scopedIssuesPath = (state) => { + if (state.searchContext?.project?.id && !state.searchContext?.project_metadata?.issues_path) { + return false; + } + return ( state.searchContext?.project_metadata?.issues_path || state.searchContext?.group_metadata?.issues_path || @@ -54,7 +58,7 @@ export const scopedMRPath = (state) => { export const defaultSearchOptions = (state, getters) => { const userName = gon.current_username; - return [ + const issues = [ { html_id: 'default-issues-assigned', title: MSG_ISSUES_ASSIGNED_TO_ME, @@ -65,6 +69,9 @@ export const defaultSearchOptions = (state, getters) => { title: MSG_ISSUES_IVE_CREATED, url: `${getters.scopedIssuesPath}/?author_username=${userName}`, }, + ]; + + const mergeRequests = [ { html_id: 'default-mrs-assigned', title: MSG_MR_ASSIGNED_TO_ME, @@ -81,6 +88,7 @@ export const defaultSearchOptions = (state, getters) => { url: `${getters.scopedMRPath}/?author_username=${userName}`, }, ]; + return [...(getters.scopedIssuesPath ? issues : []), ...mergeRequests]; }; export const projectUrl = (state) => { diff --git a/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue b/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue index ed7c9e7abe9..d91f314a86c 100644 --- a/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue +++ b/app/assets/javascripts/import_entities/import_groups/components/import_actions_cell.vue @@ -1,16 +1,9 @@ @@ -179,16 +176,16 @@ export default { -