From bfce95a4c5e9d71ed523f48f3fb901d2b7af60f7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 18 Aug 2020 21:09:57 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- GITALY_SERVER_VERSION | 2 +- .../badges/components/badge_settings.vue | 20 +- .../remove_cluster_confirmation.vue | 37 +- .../components/gke_project_id_dropdown.vue | 77 ++-- .../ide/stores/modules/terminal/messages.js | 4 +- app/assets/javascripts/lib/utils/keys.js | 3 - .../components/alert_widget_form.vue | 18 +- .../monitoring/components/dashboard.vue | 4 +- .../notes/components/note_header.vue | 2 +- .../javascripts/onboarding_issues/index.js | 18 +- .../components/customize_homepage_banner.vue | 66 +++ .../dashboard/projects/{ => index}/index.js | 3 + .../index/init_customize_homepage_banner.js | 16 + .../labels/components/promote_label_modal.vue | 39 +- .../prometheus_metrics/prometheus_metrics.js | 9 +- .../components/confidential/edit_form.vue | 42 +- .../sidebar/components/lock/edit_form.vue | 51 ++- .../source_branch_removal_status.vue | 27 +- app/assets/stylesheets/components/avatar.scss | 2 +- .../components/rich_content_editor.scss | 2 +- app/assets/stylesheets/framework/badges.scss | 2 +- .../framework/broadcast_messages.scss | 2 +- .../stylesheets/framework/gitlab_theme.scss | 4 +- app/assets/stylesheets/framework/selects.scss | 2 +- .../stylesheets/framework/variables.scss | 2 +- .../page_bundles/_ide_theme_overrides.scss | 2 +- app/assets/stylesheets/pages/graph.scss | 2 +- app/assets/stylesheets/pages/labels.scss | 4 +- app/assets/stylesheets/pages/pipelines.scss | 2 +- app/controllers/root_controller.rb | 5 + .../resolvers/metrics/dashboard_resolver.rb | 3 +- app/graphql/types/ci/pipeline_type.rb | 5 +- app/graphql/types/metrics/dashboard_type.rb | 7 + app/graphql/types/user_status_type.rb | 15 + app/graphql/types/user_type.rb | 4 + app/helpers/user_callouts_helper.rb | 5 + .../blob_viewer/metrics_dashboard_yml.rb | 15 +- app/models/discussion.rb | 1 + app/models/individual_note_discussion.rb | 8 +- .../prometheus_dashboard.rb | 12 +- app/models/repository.rb | 5 +- app/models/user_callout_enums.rb | 3 +- app/services/notes/create_service.rb | 3 +- app/views/dashboard/projects/index.html.haml | 8 + app/views/layouts/_page.html.haml | 1 + .../viewers/_metrics_dashboard_yml.html.haml | 4 +- ...esolve-button-when-replying-to-comment.yml | 5 + ...-vulnerabilities-that-do-not-have-them.yml | 5 + .../unreleased/lm-add-user-to-pipeline.yml | 5 + ...add-default-value-to-pipeline-artifact.yml | 5 + ...d-yaml-definion-validation-when-viewin.yml | 6 + ...2-allow-numbers-in-dashboard-query-key.yml | 5 + ...lue_for_file_store_to_pipeline_artifact.rb | 20 + ...nerabilities_feedback_issue_id_not_null.rb | 19 + ...ate_missing_vulnerabilities_issue_links.rb | 49 ++ db/schema_migrations/20200811130000 | 1 + db/schema_migrations/20200811130433 | 1 + db/schema_migrations/20200811194848 | 1 + db/structure.sql | 4 +- .../graphql/reference/gitlab_schema.graphql | 32 ++ doc/api/graphql/reference/gitlab_schema.json | 97 ++++ doc/api/graphql/reference/index.md | 11 + doc/development/telemetry/usage_ping.md | 4 +- .../incident_management/alertdetails.md | 194 ++++++++ doc/operations/incident_management/alerts.md | 118 +++++ .../incident_management/incidents.md | 103 +++++ doc/operations/incident_management/index.md | 433 +----------------- doc/operations/metrics/dashboards/yaml.md | 55 ++- .../project/integrations/generic_alerts.md | 2 +- .../img/project_integrations_v13_3.png | Bin 0 -> 38249 bytes .../integrations/img/project_services.png | Bin 11109 -> 0 bytes doc/user/project/integrations/overview.md | 2 +- .../partitioning/partition_creator.rb | 2 - lib/gitlab/experimentation.rb | 3 + lib/gitlab/i18n/html_todo.yml | 192 ++++---- .../stages/metric_endpoint_inserter.rb | 2 +- lib/gitlab/metrics/dashboard/validator.rb | 14 +- .../metrics/dashboard/validator/client.rb | 2 +- .../dashboard/validator/schemas/metric.json | 4 +- .../dashboard/validator/schemas/panel.json | 2 +- locale/gitlab.pot | 80 ++-- spec/controllers/root_controller_spec.rb | 24 + .../merge_request/user_posts_notes_spec.rb | 30 +- .../features/projects/blobs/blob_show_spec.rb | 2 +- .../metrics/dashboard/sample_dashboard.yml | 2 +- .../metrics/dashboard/schemas/metrics.json | 4 +- .../stores/modules/terminal/messages_spec.js | 2 + .../monitoring/components/dashboard_spec.js | 11 +- .../customize_homepage_banner_spec.js | 50 ++ .../__snapshots__/edit_form_spec.js.snap | 50 ++ .../sidebar/confidential/edit_form_spec.js | 6 +- .../lock/__snapshots__/edit_form_spec.js.snap | 79 ++++ spec/frontend/sidebar/lock/edit_form_spec.js | 12 +- spec/graphql/types/user_status_type_spec.rb | 17 + spec/graphql/types/user_type_spec.rb | 2 + spec/helpers/user_callouts_helper_spec.rb | 30 ++ .../stages/metric_endpoint_inserter_spec.rb | 10 +- .../dashboard/validator/errors_spec.rb | 13 + .../metrics/dashboard/validator_spec.rb | 52 +++ ...issing_vulnerabilities_issue_links_spec.rb | 122 +++++ .../blob_viewer/metrics_dashboard_yml_spec.rb | 50 +- spec/models/design_management/design_spec.rb | 71 +-- .../prometheus_dashboard_spec.rb | 23 +- spec/models/repository_spec.rb | 4 +- .../graphql/metrics/dashboard_query_spec.rb | 6 +- spec/requests/api/graphql/user_query_spec.rb | 4 +- spec/services/notes/create_service_spec.rb | 7 + 107 files changed, 1831 insertions(+), 898 deletions(-) create mode 100644 app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue rename app/assets/javascripts/pages/dashboard/projects/{ => index}/index.js (58%) create mode 100644 app/assets/javascripts/pages/dashboard/projects/index/init_customize_homepage_banner.js create mode 100644 app/graphql/types/user_status_type.rb create mode 100644 changelogs/unreleased/233386-fix-resolve-button-when-replying-to-comment.yml create mode 100644 changelogs/unreleased/234066-create-issuelink-for-vulnerabilities-that-do-not-have-them.yml create mode 100644 changelogs/unreleased/lm-add-user-to-pipeline.yml create mode 100644 changelogs/unreleased/mo-add-default-value-to-pipeline-artifact.yml create mode 100644 changelogs/unreleased/mwaw-219398-metrics-extend-dashboard-yaml-definion-validation-when-viewin.yml create mode 100644 changelogs/unreleased/rpereira2-allow-numbers-in-dashboard-query-key.yml create mode 100644 db/migrate/20200811194848_add_default_value_for_file_store_to_pipeline_artifact.rb create mode 100644 db/post_migrate/20200811130000_create_index_vulnerabilities_feedback_issue_id_not_null.rb create mode 100644 db/post_migrate/20200811130433_create_missing_vulnerabilities_issue_links.rb create mode 100644 db/schema_migrations/20200811130000 create mode 100644 db/schema_migrations/20200811130433 create mode 100644 db/schema_migrations/20200811194848 create mode 100644 doc/operations/incident_management/alertdetails.md create mode 100644 doc/operations/incident_management/alerts.md create mode 100644 doc/operations/incident_management/incidents.md create mode 100644 doc/user/project/integrations/img/project_integrations_v13_3.png delete mode 100644 doc/user/project/integrations/img/project_services.png create mode 100644 spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js create mode 100644 spec/frontend/sidebar/confidential/__snapshots__/edit_form_spec.js.snap create mode 100644 spec/frontend/sidebar/lock/__snapshots__/edit_form_spec.js.snap create mode 100644 spec/graphql/types/user_status_type_spec.rb create mode 100644 spec/migrations/20200811130433_create_missing_vulnerabilities_issue_links_spec.rb diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index b0d59f532f4..3d4bf7f0ea0 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -397a8aa41c8b1b159a667fb262aebc644719e074 +14370f86aaddaf173ff205148704eab118d8d181 diff --git a/app/assets/javascripts/badges/components/badge_settings.vue b/app/assets/javascripts/badges/components/badge_settings.vue index 531f84ad272..dc107cb44a1 100644 --- a/app/assets/javascripts/badges/components/badge_settings.vue +++ b/app/assets/javascripts/badges/components/badge_settings.vue @@ -6,6 +6,7 @@ import DeprecatedModal2 from '~/vue_shared/components/deprecated_modal_2.vue'; import Badge from './badge.vue'; import BadgeForm from './badge_form.vue'; import BadgeList from './badge_list.vue'; +import { GlSprintf } from '@gitlab/ui'; export default { name: 'BadgeSettings', @@ -14,14 +15,15 @@ export default { BadgeForm, BadgeList, GlModal: DeprecatedModal2, + GlSprintf, + }, + i18n: { + deleteModalText: s__( + 'Badges|You are going to delete this badge. Deleted badges %{strongStart}cannot%{strongEnd} be restored.', + ), }, computed: { ...mapState(['badgeInModal', 'isEditing']), - deleteModalText() { - return s__( - 'Badges|You are going to delete this badge. Deleted badges cannot be restored.', - ); - }, }, methods: { ...mapActions(['deleteBadge']), @@ -54,7 +56,13 @@ export default { :link-url="badgeInModal ? badgeInModal.renderedLinkUrl : ''" /> -

+

+ + + +

diff --git a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue index 4c4a728591b..3e3b102f0aa 100644 --- a/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue +++ b/app/assets/javascripts/clusters/components/remove_cluster_confirmation.vue @@ -1,6 +1,6 @@ + + diff --git a/app/assets/javascripts/pages/dashboard/projects/index.js b/app/assets/javascripts/pages/dashboard/projects/index/index.js similarity index 58% rename from app/assets/javascripts/pages/dashboard/projects/index.js rename to app/assets/javascripts/pages/dashboard/projects/index/index.js index 01001d4f3ff..b3c95f4ac1f 100644 --- a/app/assets/javascripts/pages/dashboard/projects/index.js +++ b/app/assets/javascripts/pages/dashboard/projects/index/index.js @@ -1,5 +1,8 @@ import ProjectsList from '~/projects_list'; +import initCustomizeHomepageBanner from './init_customize_homepage_banner'; document.addEventListener('DOMContentLoaded', () => { new ProjectsList(); // eslint-disable-line no-new + + initCustomizeHomepageBanner(); }); diff --git a/app/assets/javascripts/pages/dashboard/projects/index/init_customize_homepage_banner.js b/app/assets/javascripts/pages/dashboard/projects/index/init_customize_homepage_banner.js new file mode 100644 index 00000000000..c0735dde1da --- /dev/null +++ b/app/assets/javascripts/pages/dashboard/projects/index/init_customize_homepage_banner.js @@ -0,0 +1,16 @@ +import Vue from 'vue'; +import CustomizeHomepageBanner from './components/customize_homepage_banner.vue'; + +export default () => { + const el = document.querySelector('.js-customize-homepage-banner'); + + if (!el) { + return false; + } + + return new Vue({ + el, + provide: { ...el.dataset }, + render: createElement => createElement(CustomizeHomepageBanner), + }); +}; diff --git a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue index 08078fa6b62..385da528d89 100644 --- a/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue +++ b/app/assets/javascripts/pages/projects/labels/components/promote_label_modal.vue @@ -1,15 +1,16 @@