From 6e7be08ca5d6fac981284e7b1383b320a03d3a5d Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 11 Oct 2022 18:09:43 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/filter_sort/sort_dropdown.vue | 6 +- .../javascripts/sidebar/mount_sidebar.js | 2 +- .../vue_shared/components/markdown/header.vue | 1 + .../components/registry/registry_search.vue | 5 ++ app/helpers/form_helper.rb | 17 ++-- app/helpers/wiki_helper.rb | 3 +- app/models/concerns/issuable.rb | 15 ++++ app/models/merge_request.rb | 14 +-- app/models/project.rb | 5 ++ .../update_assignees_service.rb | 12 ++- app/services/notes/create_service.rb | 38 ++++++-- .../cleanup_tags_service.rb | 3 +- .../issuable/_sidebar_assignees.html.haml | 2 +- .../issuable/_sidebar_reviewers.html.haml | 2 +- ...e.yml => limit_assignees_per_issuable.yml} | 8 +- config/metrics/aggregates/common.yml | 62 ------------- ...nagement_incidents_total_unique_counts.yml | 17 ++++ .../counts_28d/20220222215951_xmau_plan.yml | 9 ++ ...20220222215952_xmau_project_management.yml | 9 ++ .../20220222215955_users_work_items.yml | 9 ++ ...nagement_incidents_total_unique_counts.yml | 17 ++++ .../counts_7d/20220222215851_xmau_plan.yml | 11 ++- ...20220222215852_xmau_project_management.yml | 9 ++ .../20220222215855_users_work_items.yml | 9 ++ config/sidekiq_queues.yml | 2 + doc/api/graphql/reference/index.md | 1 + doc/api/group_protected_environments.md | 4 +- .../blueprints/rate_limiting/index.md | 2 +- doc/ci/environments/protected_environments.md | 6 +- doc/development/pipelines.md | 5 ++ doc/development/sec/index.md | 2 +- .../end_to_end/beginners_guide.md | 28 ++++-- ...lue_stream_analytics_aggregated_backend.md | 4 +- doc/development/work_items.md | 4 +- doc/subscriptions/gitlab_dedicated/index.md | 4 +- .../get-started-security.md | 2 +- .../img/secure_tools_and_cicd_stages.png | Bin 0 -> 42240 bytes doc/user/application_security/index.md | 24 ++++- .../policies/scan-execution-policies.md | 8 +- doc/user/group/import/index.md | 2 +- doc/user/group/saml_sso/scim_setup.md | 2 +- .../group/settings/group_access_tokens.md | 2 +- doc/user/group/subgroups/index.md | 2 +- doc/user/workspace/index.md | 2 +- .../work_items_activity_aggregated_metric.rb | 13 +++ lib/tasks/gitlab/tw/codeowners.rake | 3 +- qa/qa/page/base.rb | 5 ++ qa/qa/page/component/namespace_select.rb | 2 +- qa/qa/page/merge_request/new.rb | 1 - qa/qa/page/merge_request/show.rb | 5 +- ...er_interacts_with_batched_mr_diffs_spec.rb | 4 +- .../filter_sort/sort_dropdown_spec.js | 2 +- spec/helpers/form_helper_spec.rb | 72 ++++++++++++--- spec/helpers/wiki_helper_spec.rb | 18 ++-- ...k_items_activity_aggregated_metric_spec.rb | 54 +++++++++++ spec/models/concerns/issuable_spec.rb | 18 ++++ spec/models/project_spec.rb | 16 ++++ .../update_assignees_service_spec.rb | 26 +++--- .../cleanup_tags_service_spec.rb | 8 -- .../issuable/max_issuable_examples.rb | 85 ++++++++++++++++++ workhorse/go.mod | 2 +- workhorse/go.sum | 4 +- 62 files changed, 552 insertions(+), 177 deletions(-) rename config/feature_flags/development/{container_registry_new_cleanup_service.yml => limit_assignees_per_issuable.yml} (67%) delete mode 100644 config/metrics/aggregates/common.yml create mode 100644 doc/user/application_security/img/secure_tools_and_cicd_stages.png create mode 100644 lib/gitlab/usage/metrics/instrumentations/work_items_activity_aggregated_metric.rb create mode 100644 spec/lib/gitlab/usage/metrics/instrumentations/work_items_activity_aggregated_metric_spec.rb create mode 100644 spec/support/shared_examples/quick_actions/issuable/max_issuable_examples.rb diff --git a/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue b/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue index ce28283ccdf..01f145e0862 100644 --- a/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue +++ b/app/assets/javascripts/members/components/filter_sort/sort_dropdown.vue @@ -4,6 +4,7 @@ import { mapState } from 'vuex'; import { visitUrl } from '~/lib/utils/url_utility'; import { FIELDS } from '~/members/constants'; import { parseSortParam, buildSortHref } from '~/members/utils'; +import { SORT_DIRECTION_UI } from '~/search/sort/constants'; export default { name: 'SortDropdown', @@ -30,6 +31,9 @@ export default { isAscending() { return !this.sort.sortDesc; }, + sortDirectionData() { + return this.isAscending ? SORT_DIRECTION_UI.asc : SORT_DIRECTION_UI.desc; + }, filteredOptions() { return FIELDS.filter( (field) => this.tableSortableFields.includes(field.key) && field.sort, @@ -70,7 +74,7 @@ export default { data-testid="members-sort-dropdown" :text="activeOptionLabel" :is-ascending="isAscending" - :sort-direction-tool-tip="__('Sort direction')" + :sort-direction-tool-tip="sortDirectionData.tooltip" @sortDirectionChange="handleSortDirectionChange" > 1, editable, }, scopedSlots: { diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue index 6019412b688..89fffdedbfd 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/header.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue @@ -243,6 +243,7 @@ export default { variant="confirm" category="primary" size="small" + data-qa-selector="dismiss_suggestion_popover_button" @click="handleSuggestDismissed" > {{ __('Got it') }} diff --git a/app/assets/javascripts/vue_shared/components/registry/registry_search.vue b/app/assets/javascripts/vue_shared/components/registry/registry_search.vue index 1948a6778f4..8c9c7c63db1 100644 --- a/app/assets/javascripts/vue_shared/components/registry/registry_search.vue +++ b/app/assets/javascripts/vue_shared/components/registry/registry_search.vue @@ -1,6 +1,7 @@