From b2180a27bcf74e622df4d7fb173306d80b973a6c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 2 Jun 2021 09:09:46 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/review.gitlab-ci.yml | 2 +- .gitlab/issue_templates/Documentation.md | 2 +- .../merge_request_templates/Documentation.md | 4 +- .rubocop_manual_todo.yml | 2 - .../cycle_analytics/components/base.vue | 102 ++++----- .../components/path_navigation.vue | 117 +++++++++++ .../javascripts/cycle_analytics/constants.js | 1 + .../cycle_analytics/store/getters.js | 10 + .../cycle_analytics/store/index.js | 2 + .../cycle_analytics/store/mutations.js | 5 +- .../javascripts/cycle_analytics/utils.js | 109 +++++++++- .../components/states/ready_to_merge.vue | 2 +- .../page_bundles/cycle_analytics.scss | 27 +-- .../projects/compare_controller.rb | 6 +- .../slack_mattermost_notifier.rb} | 4 +- .../concerns/issue_available_features.rb | 3 +- app/models/integrations/mattermost.rb | 2 +- app/models/integrations/slack.rb | 2 +- app/models/issue.rb | 4 + app/serializers/analytics_stage_entity.rb | 6 +- .../integrations.html.haml | 2 +- .../settings/integrations/index.html.haml | 2 +- doc/administration/job_artifacts.md | 2 +- doc/administration/maintenance_mode/index.md | 26 +-- doc/administration/object_storage.md | 12 +- .../contributing/issue_workflow.md | 4 +- .../documentation/styleguide/index.md | 2 +- doc/development/experiment_guide/index.md | 2 +- doc/development/feature_flags/controls.md | 4 +- doc/development/i18n/merging_translations.md | 4 +- doc/development/maintenance_mode.md | 4 +- doc/development/stage_group_dashboards.md | 2 +- doc/user/gitlab_com/index.md | 2 +- .../img/access_requests_management_v13_9.png | Bin 24246 -> 0 bytes .../img/add_user_email_accept_v13_9.png | Bin 21877 -> 0 bytes .../img/add_user_email_ready_v13_8.png | Bin 28850 -> 0 bytes .../img/add_user_email_search_v13_8.png | Bin 29293 -> 0 bytes .../img/withdraw_access_request_button.png | Bin 28154 -> 0 bytes doc/user/project/members/index.md | 197 ++++++++---------- doc/user/project/settings/index.md | 2 +- doc/user/search/advanced_search.md | 42 ++-- .../Security/Container-Scanning.gitlab-ci.yml | 3 +- .../issue_and_merge_request_actions.rb | 2 + .../imap_authentication_check.rb | 2 +- locale/gitlab.pot | 33 +-- package.json | 2 +- .../projects/compare_controller_spec.rb | 17 +- spec/features/cycle_analytics_spec.rb | 4 +- .../user_searches_in_settings_spec.rb | 2 +- .../__snapshots__/base_spec.js.snap | 7 + spec/frontend/cycle_analytics/base_spec.js | 173 +++++++++++++++ spec/frontend/cycle_analytics/mock_data.js | 80 ++++++- .../cycle_analytics/path_navigation_spec.js | 136 ++++++++++++ .../cycle_analytics/store/getters_spec.js | 16 ++ spec/frontend/cycle_analytics/utils_spec.js | 108 +++++++++- .../states/mr_widget_ready_to_merge_spec.js | 35 +++- .../imap_authentication_check_spec.rb | 31 +++ .../project_level_stage_adapter_spec.rb | 2 +- spec/models/integrations/mattermost_spec.rb | 2 +- spec/models/integrations/slack_spec.rb | 2 +- spec/models/issue_spec.rb | 22 ++ .../notes/quick_actions_service_spec.rb | 16 ++ ...ck_mattermost_notifier_shared_examples.rb} | 11 +- yarn.lock | 8 +- 64 files changed, 1110 insertions(+), 325 deletions(-) create mode 100644 app/assets/javascripts/cycle_analytics/components/path_navigation.vue create mode 100644 app/assets/javascripts/cycle_analytics/store/getters.js rename app/models/{project_services/slack_mattermost/notifier.rb => concerns/integrations/slack_mattermost_notifier.rb} (91%) delete mode 100644 doc/user/project/members/img/access_requests_management_v13_9.png delete mode 100644 doc/user/project/members/img/add_user_email_accept_v13_9.png delete mode 100644 doc/user/project/members/img/add_user_email_ready_v13_8.png delete mode 100644 doc/user/project/members/img/add_user_email_search_v13_8.png delete mode 100644 doc/user/project/members/img/withdraw_access_request_button.png create mode 100644 spec/frontend/cycle_analytics/__snapshots__/base_spec.js.snap create mode 100644 spec/frontend/cycle_analytics/base_spec.js create mode 100644 spec/frontend/cycle_analytics/path_navigation_spec.js create mode 100644 spec/frontend/cycle_analytics/store/getters_spec.js create mode 100644 spec/lib/system_check/incoming_email/imap_authentication_check_spec.rb rename spec/support/shared_examples/models/{slack_mattermost_notifications_shared_examples.rb => concerns/integrations/slack_mattermost_notifier_shared_examples.rb} (98%) diff --git a/.gitlab/ci/review.gitlab-ci.yml b/.gitlab/ci/review.gitlab-ci.yml index 2605b3ec8b6..635b4099ce4 100644 --- a/.gitlab/ci/review.gitlab-ci.yml +++ b/.gitlab/ci/review.gitlab-ci.yml @@ -113,7 +113,6 @@ review-stop: .review-qa-base: extends: - .use-docker-in-docker - retry: 1 # This is confusing but this means "2 runs at max". image: registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-qa-alpine-ruby-2.7 stage: qa needs: ["review-deploy"] @@ -165,6 +164,7 @@ review-qa-smoke: extends: - .review-qa-base - .review:rules:review-qa-smoke + retry: 1 # This is confusing but this means "2 runs at max". script: - gitlab-qa Test::Instance::Smoke "${QA_IMAGE}" "${CI_ENVIRONMENT_URL}" diff --git a/.gitlab/issue_templates/Documentation.md b/.gitlab/issue_templates/Documentation.md index f05d7049b7f..c58b6d0cf06 100644 --- a/.gitlab/issue_templates/Documentation.md +++ b/.gitlab/issue_templates/Documentation.md @@ -25,7 +25,7 @@ * Include use cases, benefits, and/or goals for this work. * If adding content: What audience is it intended for? (What roles and scenarios?) For ideas, see personas at https://about.gitlab.com/handbook/marketing/product-marketing/roles-personas/ or the persona labels at - https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=persona%3A + https://gitlab.com/groups/gitlab-org/-/labels?subscribed=&search=persona%3A --> ### Proposal diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md index fac84d98141..9c6b5a73b4f 100644 --- a/.gitlab/merge_request_templates/Documentation.md +++ b/.gitlab/merge_request_templates/Documentation.md @@ -52,8 +52,8 @@ All reviewers can help ensure accuracy, clarity, completeness, and adherence to - [ ] Technical writer review. If not requested for this MR, must be scheduled post-merge. To request for this MR, assign the writer listed for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/categories/#devops-stages). - [ ] Ensure docs metadata are present and up-to-date. - [ ] Ensure ~"Technical Writing" and ~"documentation" are added. - - [ ] Add the corresponding `docs::` [scoped label](https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=docs%3A%3A). - - [ ] If working on UI text, add the corresponding `UI Text` [scoped label](https://gitlab.com/groups/gitlab-org/-/labels?utf8=%E2%9C%93&subscribed=&search=ui+text). + - [ ] Add the corresponding `docs::` [scoped label](https://gitlab.com/groups/gitlab-org/-/labels?subscribed=&search=docs%3A%3A). + - [ ] If working on UI text, add the corresponding `UI Text` [scoped label](https://gitlab.com/groups/gitlab-org/-/labels?subscribed=&search=ui+text). - [ ] Add ~"tw::doing" when starting work on the MR. - [ ] Add ~"tw::finished" if Technical Writing team work on the MR is complete but it remains open. diff --git a/.rubocop_manual_todo.yml b/.rubocop_manual_todo.yml index 80fc20610e7..679441f6536 100644 --- a/.rubocop_manual_todo.yml +++ b/.rubocop_manual_todo.yml @@ -722,7 +722,6 @@ RSpec/EmptyLineAfterFinalLetItBe: - spec/services/wiki_pages/event_create_service_spec.rb - spec/support/shared_examples/graphql/design_fields_shared_examples.rb - spec/support/shared_examples/graphql/mutations/set_assignees_shared_examples.rb - - spec/support/shared_examples/models/slack_mattermost_notifications_shared_examples.rb - spec/support/shared_examples/quick_actions/issuable/issuable_quick_actions_shared_examples.rb - spec/support/shared_examples/services/container_registry_auth_service_shared_examples.rb - spec/support/shared_examples/services/packages_shared_examples.rb @@ -2917,5 +2916,4 @@ Style/RegexpLiteralMixedPreserve: - 'spec/support/helpers/grafana_api_helpers.rb' - 'spec/support/helpers/query_recorder.rb' - 'spec/support/helpers/require_migration.rb' - - 'spec/support/shared_examples/models/slack_mattermost_notifications_shared_examples.rb' - 'spec/views/layouts/_head.html.haml_spec.rb' diff --git a/app/assets/javascripts/cycle_analytics/components/base.vue b/app/assets/javascripts/cycle_analytics/components/base.vue index 11a263015e4..e3703fc066d 100644 --- a/app/assets/javascripts/cycle_analytics/components/base.vue +++ b/app/assets/javascripts/cycle_analytics/components/base.vue @@ -1,7 +1,8 @@