From c0dd450008c1cee260905e54bbed202891158697 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 26 Mar 2021 12:09:15 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/alerts_integrations_list.vue | 13 ++- app/assets/javascripts/api.js | 15 +++- .../javascripts/badges/components/badge.vue | 7 +- .../boards/components/board_form.vue | 18 ++-- .../boards/components/toggle_focus.vue | 1 + .../components/triggers_list.vue | 10 ++- .../gl_dropdown_filter.js | 23 +++--- .../components/toolbar/design_navigation.vue | 10 ++- .../diffs/components/compare_versions.vue | 1 + .../components/environment_rollback.vue | 1 + .../issuable/components/issuable_by_email.vue | 6 +- .../components/issuable_title.vue | 7 +- .../issue_show/components/title.vue | 7 +- .../components/dashboard_header.vue | 7 +- .../monitoring/components/refresh_button.vue | 8 +- .../discussion_resolve_with_issue_button.vue | 7 +- .../notes/components/sort_discussion.vue | 11 ++- .../settings/components/settings_form.vue | 14 ++-- .../components/release_block_header.vue | 7 +- .../search/sort/components/app.vue | 1 + .../reviewers/uncollapsed_reviewer_list.vue | 8 +- .../snippets/components/embed_dropdown.vue | 1 + .../static_site_editor/graphql/index.js | 4 +- .../vue_shared/components/clone_dropdown.vue | 2 + .../filtered_search_bar_root.vue | 1 + .../tokens/label_token.vue | 31 +++++-- .../components/modal_copy_button.vue | 1 + app/models/merge_request.rb | 1 + app/models/namespace.rb | 4 + app/serializers/pipeline_serializer.rb | 1 - .../settings/_permanent_deletion.html.haml | 3 +- .../groups/settings/_remove_button.html.haml | 7 ++ app/views/layouts/nav/_breadcrumbs.html.haml | 2 +- .../unreleased/321788-drop-unused-preload.yml | 5 ++ ...gistry-cleanup-policy-wiped-all-images.yml | 5 ++ ...ettings-to-use-the-blue-primary-button.yml | 5 ++ .../cngo-add-aria-labels-to-icon-buttons.yml | 5 ++ .../unreleased/id-n-1-for-jira-pulls.yml | 5 ++ .../{development => ops}/usage_data_api.yml | 4 +- doc/administration/geo/glossary.md | 2 +- .../replication/version_specific_updates.md | 2 +- doc/administration/geo/setup/index.md | 2 +- doc/ci/yaml/README.md | 64 +++++++++++++++ doc/development/usage_ping/dictionary.md | 48 +++++++++++ doc/user/project/issues/managing_issues.md | 11 +-- lib/api/usage_data.rb | 2 +- lib/api/v3/github.rb | 7 +- lib/gitlab/gon_helper.rb | 2 +- .../known_events/epic_events.yml | 12 +++ locale/gitlab.pot | 9 ++ .../settings/registry_settings_spec.rb | 4 +- .../projects/sub_group_issuables_spec.rb | 10 +-- spec/frontend/api_spec.js | 21 ++--- .../design_navigation_spec.js.snap | 2 + .../settings/components/settings_form_spec.js | 82 ++++++++++++++----- .../__snapshots__/clone_dropdown_spec.js.snap | 2 + .../tokens/label_token_spec.js | 16 ++++ spec/models/namespace_spec.rb | 6 ++ spec/requests/api/v3/github_spec.rb | 50 ++++++++--- spec/serializers/pipeline_serializer_spec.rb | 2 +- .../features/error_tracking_shared_example.rb | 2 +- .../groups/settings/_remove.html.haml_spec.rb | 17 ++++ 62 files changed, 515 insertions(+), 129 deletions(-) create mode 100644 app/views/groups/settings/_remove_button.html.haml create mode 100644 changelogs/unreleased/321788-drop-unused-preload.yml create mode 100644 changelogs/unreleased/325429-container-registry-cleanup-policy-wiped-all-images.yml create mode 100644 changelogs/unreleased/325812-update-the-package-settings-to-use-the-blue-primary-button.yml create mode 100644 changelogs/unreleased/cngo-add-aria-labels-to-icon-buttons.yml create mode 100644 changelogs/unreleased/id-n-1-for-jira-pulls.yml rename config/feature_flags/{development => ops}/usage_data_api.yml (81%) create mode 100644 spec/views/groups/settings/_remove.html.haml_spec.rb diff --git a/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue b/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue index a071e011ec3..417ecd7f3b4 100644 --- a/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue +++ b/app/assets/javascripts/alerts_settings/components/alerts_integrations_list.vue @@ -21,6 +21,8 @@ import { import getCurrentIntegrationQuery from '../graphql/queries/get_current_integration.query.graphql'; export const i18n = { + deleteIntegration: s__('AlertSettings|Delete integration'), + editIntegration: s__('AlertSettings|Edit integration'), title: s__('AlertsIntegrations|Current integrations'), emptyState: s__('AlertsIntegrations|No integrations have been added yet'), status: { @@ -174,11 +176,16 @@ export default {