From d30a9499faf30d5f5424a52b2df286c724e253d1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 12 May 2021 21:10:13 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../issue_templates/Feature Flag Roll Out.md | 6 +- ...roposal.md => Feature Proposal - basic.md} | 2 +- ...Proposal.md => Feature Proposal - lean.md} | 2 +- ...osal.md => Feature proposal - detailed.md} | 0 .../javascripts/jobs/components/job_app.vue | 10 +- .../jobs/components/job_container_item.vue | 4 +- .../jobs/components/job_log_controllers.vue | 7 +- .../stylesheets/page_bundles/build.scss | 4 - .../notification_recipients/builder/base.rb | 6 +- ...otification_setting_recipient_refactor.yml | 5 + ...otification_setting_recipient_refactor.yml | 2 +- doc/administration/geo/index.md | 96 +-- .../contributing/issue_workflow.md | 2 +- doc/development/documentation/structure.md | 4 +- doc/update/index.md | 2 +- .../application_security/api_fuzzing/index.md | 393 +++++----- doc/user/project/bulk_editing.md | 67 +- doc/user/project/img/bulk_editing_v13_11.png | Bin 71181 -> 0 bytes doc/user/project/issues/managing_issues.md | 27 + .../project/merge_requests/reviews/index.md | 21 + locale/gitlab.pot | 3 + spec/features/admin/admin_mode/logout_spec.rb | 76 +- spec/features/admin/admin_mode_spec.rb | 269 ++++--- spec/features/dashboard/active_tab_spec.rb | 56 +- ...ith_external_authorization_service_spec.rb | 74 +- spec/features/dashboard/shortcuts_spec.rb | 132 ++-- ...uently_visited_projects_and_groups_spec.rb | 82 ++- spec/features/projects/new_project_spec.rb | 678 +++++++++--------- 28 files changed, 1112 insertions(+), 918 deletions(-) rename .gitlab/issue_templates/{Basic Proposal.md => Feature Proposal - basic.md} (68%) rename .gitlab/issue_templates/{Lean Feature Proposal.md => Feature Proposal - lean.md} (96%) rename .gitlab/issue_templates/{Feature proposal.md => Feature proposal - detailed.md} (100%) create mode 100644 changelogs/unreleased/feature-default-enabled-notification_setting_recipient_refactor.yml delete mode 100644 doc/user/project/img/bulk_editing_v13_11.png diff --git a/.gitlab/issue_templates/Feature Flag Roll Out.md b/.gitlab/issue_templates/Feature Flag Roll Out.md index 63017fcba3a..f07604d2d3d 100644 --- a/.gitlab/issue_templates/Feature Flag Roll Out.md +++ b/.gitlab/issue_templates/Feature Flag Roll Out.md @@ -84,13 +84,13 @@ Are there any other stages or teams involved that need to be kept in the loop? ### Global rollout on production -- [ ] [Incrementally roll out](https://docs.gitlab.com/ee/development/feature_flags/controls.html#process) the feature. If there is no risk that the feature affects usability or server loads, skip to the global rollout. +- [ ] [Incrementally roll out](https://docs.gitlab.com/ee/development/feature_flags/controls.html#process) the feature. - If the feature flag in code has [an actor](https://docs.gitlab.com/ee/development/feature_flags/#feature-actors), perform **actor-based** rollout. - [ ] `/chatops run feature set --actors` - If the feature flag in code does **NOT** have [an actor](https://docs.gitlab.com/ee/development/feature_flags/#feature-actors), perform time-based rollout (**random** rollout). - [ ] `/chatops run feature set ` -- [ ] Enable the feature globally on production environment. - - [ ] `/chatops run feature set true` + - Enable the feature globally on production environment. + - [ ] `/chatops run feature set true` - [ ] Announce on [the feature issue](ISSUE LINK) that the feature has been globally enabled. - [ ] Cross-post chatops slack command to `#support_gitlab-com`. ([more guidance when this is necessary in the dev docs](https://docs.gitlab.com/ee/development/feature_flags/controls.html#communicate-the-change)) and in your team channel diff --git a/.gitlab/issue_templates/Basic Proposal.md b/.gitlab/issue_templates/Feature Proposal - basic.md similarity index 68% rename from .gitlab/issue_templates/Basic Proposal.md rename to .gitlab/issue_templates/Feature Proposal - basic.md index 8d47e87f8a3..099243c05ca 100644 --- a/.gitlab/issue_templates/Basic Proposal.md +++ b/.gitlab/issue_templates/Feature Proposal - basic.md @@ -4,7 +4,7 @@ -
diff --git a/app/assets/javascripts/jobs/components/job_log_controllers.vue b/app/assets/javascripts/jobs/components/job_log_controllers.vue index ea50a11bed6..957e8243f33 100644 --- a/app/assets/javascripts/jobs/components/job_log_controllers.vue +++ b/app/assets/javascripts/jobs/components/job_log_controllers.vue @@ -69,7 +69,10 @@ export default {