From 0a559c913e4d333f339fcc03b89bfeade9ca0b93 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 27 Oct 2021 12:09:41 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../issue_templates/Audit Event Proposal.md | 2 +- .gitlab/issue_templates/Bug.md | 6 +- .../Experiment Successful Cleanup.md | 2 +- .../Feature Proposal - basic.md | 2 +- .../Feature Proposal - lean.md | 2 +- .../Feature proposal - detailed.md | 4 +- .gitlab/issue_templates/InfraDev.md | 2 +- .gitlab/issue_templates/Refactoring.md | 4 +- .../issue_templates/Technical Evaluation.md | 2 +- .../merge_request_templates/Documentation.md | 4 +- .../New End To End Test.md | 4 +- .../Pipeline Configuration.md | 2 +- .../Quarantine End to End Test.md | 2 +- GITALY_SERVER_VERSION | 2 +- .../components/issues_list_app.vue | 22 ++++- .../javascripts/issues_list/constants.js | 19 ++++- app/assets/javascripts/issues_list/index.js | 2 + .../queries/get_issues.query.graphql | 4 + .../queries/get_issues_counts.query.graphql | 8 ++ app/assets/javascripts/issues_list/utils.js | 20 ++++- .../components/extensions/base.vue | 12 ++- .../extensions/issues.js | 1 + .../filtered_search_bar/constants.js | 1 + .../tokens/release_token.vue | 85 +++++++++++++++++++ app/controllers/projects/issues_controller.rb | 4 +- app/controllers/projects/wikis_controller.rb | 2 + app/helpers/issues_helper.rb | 1 + .../integrations/base_chat_notification.rb | 7 +- app/models/integrations/discord.rb | 7 +- app/models/integrations/emails_on_push.rb | 7 +- app/models/integrations/hangouts_chat.rb | 7 +- app/models/integrations/microsoft_teams.rb | 7 +- app/models/integrations/pipelines_email.rb | 1 + app/models/integrations/unify_circuit.rb | 7 +- app/models/integrations/webex_teams.rb | 7 +- app/services/issues/update_service.rb | 2 +- config/environments/test.rb | 4 - .../development/broadcast_issue_updates.yml | 4 +- .../development/real_time_issue_sidebar.yml | 2 +- config/initializers/7_prometheus_metrics.rb | 2 +- config/initializers/action_cable.rb | 3 +- danger/metadata/Dangerfile | 15 ++-- danger/specialization_labels/Dangerfile | 2 +- danger/specs/Dangerfile | 2 +- .../feature_flags_development/index.md | 2 +- .../application_slis/rails_request_apdex.md | 4 +- .../contributing/issue_workflow.md | 16 ++-- doc/development/documentation/workflow.md | 2 +- doc/development/testing_guide/review_apps.md | 4 +- doc/user/project/integrations/mattermost.md | 2 +- doc/user/project/integrations/slack.md | 2 +- .../project/integrations/unify_circuit.md | 2 +- doc/user/project/issues/managing_issues.md | 14 ++- lib/api/snippets.rb | 2 +- lib/api/wikis.rb | 2 +- lib/gitlab/action_cable/config.rb | 4 - .../metrics/samplers/action_cable_sampler.rb | 23 ++--- lib/gitlab/runtime.rb | 8 +- locale/gitlab.pot | 6 ++ .../projects/issues_controller_spec.rb | 30 ++++--- .../components/issues_list_app_spec.js | 2 + spec/frontend/issues_list/mock_data.js | 40 +++++++-- spec/frontend/issues_list/utils_spec.js | 8 +- .../vue_mr_widget/mr_widget_options_spec.js | 5 +- spec/frontend/vue_mr_widget/test_extension.js | 1 + .../filtered_search_bar/mock_data.js | 9 ++ .../tokens/release_token_spec.js | 78 +++++++++++++++++ spec/helpers/issues_helper_spec.rb | 1 + .../samplers/action_cable_sampler_spec.rb | 84 +++++++----------- spec/lib/gitlab/runtime_spec.rb | 22 ++--- spec/serializers/service_field_entity_spec.rb | 2 +- spec/services/issues/update_service_spec.rb | 44 ++++++---- spec/tooling/danger/changelog_spec.rb | 4 +- tooling/danger/changelog.rb | 2 +- 74 files changed, 505 insertions(+), 227 deletions(-) create mode 100644 app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/release_token.vue create mode 100644 spec/frontend/vue_shared/components/filtered_search_bar/tokens/release_token_spec.js diff --git a/.gitlab/issue_templates/Audit Event Proposal.md b/.gitlab/issue_templates/Audit Event Proposal.md index 7a5408ca1f2..af32845bd9a 100644 --- a/.gitlab/issue_templates/Audit Event Proposal.md +++ b/.gitlab/issue_templates/Audit Event Proposal.md @@ -9,5 +9,5 @@ /label ~"Category:Audit Events" -/label ~"feature" +/label ~"type::feature" /label ~"group::compliance" diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 41b694fdf2c..b9fed3745d1 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -2,10 +2,10 @@ Please read this! Before opening a new issue, make sure to search for keywords in the issues -filtered by the "regression" or "bug" label: +filtered by the "regression" or "type::bug" label: - https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=regression -- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=bug +- https://gitlab.com/gitlab-org/gitlab/issues?label_name%5B%5D=type::bug and verify the issue you're about to submit isn't a duplicate. ---> @@ -82,4 +82,4 @@ will also determine whether the bug is fixed in a more recent version. --> -/label ~bug +/label ~"type::bug" diff --git a/.gitlab/issue_templates/Experiment Successful Cleanup.md b/.gitlab/issue_templates/Experiment Successful Cleanup.md index 42f26342342..e28c866c0e5 100644 --- a/.gitlab/issue_templates/Experiment Successful Cleanup.md +++ b/.gitlab/issue_templates/Experiment Successful Cleanup.md @@ -17,4 +17,4 @@ The changes need to become an official part of the product. - [ ] After the flag removal is deployed, [clean up the feature/experiment feature flags](https://docs.gitlab.com/ee/development/feature_flags/controls.html#cleaning-up) by running chatops command in `#production` channel - [ ] Ensure the corresponding [Experiment Tracking](https://gitlab.com/groups/gitlab-org/-/boards/1352542?label_name[]=devops%3A%3Agrowth&label_name[]=growth%20experiment&label_name[]=experiment%20tracking) issue is updated -/label ~"feature" ~"feature::maintenance" ~"workflow::scheduling" ~"growth experiment" ~"feature flag" +/label ~"type::maintenance" ~"workflow::scheduling" ~"growth experiment" ~"feature flag" diff --git a/.gitlab/issue_templates/Feature Proposal - basic.md b/.gitlab/issue_templates/Feature Proposal - basic.md index 0c05b7a0165..794611180eb 100644 --- a/.gitlab/issue_templates/Feature Proposal - basic.md +++ b/.gitlab/issue_templates/Feature Proposal - basic.md @@ -7,4 +7,4 @@ -/label ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate" +/label ~"type::feature" ~feature::addition ~"group::" ~"section::" ~"Category:" ~"GitLab Core"/~"GitLab Premium"/~"GitLab Ultimate" diff --git a/.gitlab/issue_templates/Feature Proposal - lean.md b/.gitlab/issue_templates/Feature Proposal - lean.md index 9dd4bdc6b22..f653f03995d 100644 --- a/.gitlab/issue_templates/Feature Proposal - lean.md +++ b/.gitlab/issue_templates/Feature Proposal - lean.md @@ -14,7 +14,7 @@ -/label ~"feature" ~"group::" ~"section::" ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate" +/label ~"type::feature" ~"group::" ~"section::" ~"Category::" ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate" /label ~devops:: ~group: ~Category: /label ~"GitLab Free"/~"GitLab Premium"/~"GitLab Ultimate" -/label ~feature -/label ~documentation -/label ~direction +/label ~"type::feature" ~documentation ~direction diff --git a/.gitlab/issue_templates/InfraDev.md b/.gitlab/issue_templates/InfraDev.md index bc0e65c3c22..d337e75289c 100644 --- a/.gitlab/issue_templates/InfraDev.md +++ b/.gitlab/issue_templates/InfraDev.md @@ -53,4 +53,4 @@ See also: --> /label ~"infradev" -/label ~"bug" +/label ~"type::bug" diff --git a/.gitlab/issue_templates/Refactoring.md b/.gitlab/issue_templates/Refactoring.md index d9466185ff7..df18dcf7656 100644 --- a/.gitlab/issue_templates/Refactoring.md +++ b/.gitlab/issue_templates/Refactoring.md @@ -41,9 +41,9 @@ please list them here. -/label ~"feature::maintenance" +/label ~"type::maintenance" diff --git a/.gitlab/issue_templates/Technical Evaluation.md b/.gitlab/issue_templates/Technical Evaluation.md index cf939725a78..680ecb7d9a6 100644 --- a/.gitlab/issue_templates/Technical Evaluation.md +++ b/.gitlab/issue_templates/Technical Evaluation.md @@ -29,5 +29,5 @@ ### Team -- [ ] Add ~"workflow::planning breakdown" ~feature and the corresponding `~devops::` and `~group::` labels. +- [ ] Add ~"workflow::planning breakdown" ~"type::feature" and the corresponding `~devops::` and `~group::` labels. - [ ] Ping the PM and EM. diff --git a/.gitlab/merge_request_templates/Documentation.md b/.gitlab/merge_request_templates/Documentation.md index 66c1eff412b..893ae7b93b5 100644 --- a/.gitlab/merge_request_templates/Documentation.md +++ b/.gitlab/merge_request_templates/Documentation.md @@ -20,10 +20,10 @@ If you are only adding documentation, do not add any of the following labels: -- `~"feature"` +- `~"type::feature"` - `~"frontend"` - `~"backend"` -- `~"bug"` +- `~"type::bug"` - `~"database"` These labels cause the MR to be added to code verification QA issues. diff --git a/.gitlab/merge_request_templates/New End To End Test.md b/.gitlab/merge_request_templates/New End To End Test.md index f9664c6315f..9ecf8999f66 100644 --- a/.gitlab/merge_request_templates/New End To End Test.md +++ b/.gitlab/merge_request_templates/New End To End Test.md @@ -24,5 +24,5 @@ Please link to the respective test case in the testcases project /label ~"Quality:test-gap" ~"Quality:EE test gaps" - -/label ~"feature::addition" ~"feature::maintenance" + +/label ~"feature::addition" ~"type::maintenance" diff --git a/.gitlab/merge_request_templates/Pipeline Configuration.md b/.gitlab/merge_request_templates/Pipeline Configuration.md index 083992bff92..62210028c18 100644 --- a/.gitlab/merge_request_templates/Pipeline Configuration.md +++ b/.gitlab/merge_request_templates/Pipeline Configuration.md @@ -35,4 +35,4 @@ This will help keep track of expected cost increases to the [GitLab project aver - [ ] Consider communicating these changes to the broader team following the [communication guideline for pipeline changes](https://about.gitlab.com/handbook/engineering/quality/engineering-productivity/#pipeline-changes) -/label ~tooling ~"tooling::pipelines" ~"Engineering Productivity" +/label ~"type::tooling" ~"tooling::pipelines" ~"Engineering Productivity" diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md index 4edfd2a8c8e..4caebb7f1bb 100644 --- a/.gitlab/merge_request_templates/Quarantine End to End Test.md +++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md @@ -30,7 +30,7 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new - [ ] To ensure a faster turnaround, ask in the `#quality` Slack channel for someone to review and merge the merge request, rather than assigning it directly. -/label ~"Quality" ~"QA" ~"feature" ~"feature::maintenance" +/label ~"Quality" ~"QA" ~"type::maintenance"