From 778ea71394b9bc20b614f766fbb90ddd7ef0cfe9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 13 Jul 2020 09:09:29 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/rules.gitlab-ci.yml | 14 ++ .../components/delete_button.vue | 37 ++-- .../components/list/item.vue | 2 +- .../components/upload/button.vue | 9 +- .../components/upload/design_dropzone.vue | 51 +++--- .../upload/design_version_dropdown.vue | 14 +- .../design_management_new/pages/index.vue | 55 ++++-- .../components/alerts_form.vue | 156 ++++++++++++++++ .../components/incidents_settings_tabs.vue | 49 +++++ .../incidents_settings/constants.js | 51 ++++++ .../javascripts/incidents_settings/index.js | 31 ++++ .../settings/operations/show/index.js | 2 + .../design_management/design_list_item.scss | 5 + app/assets/stylesheets/pages/diff.scss | 3 +- .../integrations/jira/issues_finder.rb | 4 +- .../jira/requests/issues/list_service.rb | 5 +- app/services/spam/spam_verdict_service.rb | 4 +- .../issues/_design_management.html.haml | 33 ++-- .../settings/operations/_incidents.html.haml | 36 +--- .../119018-move-alert-settings-to-Vue.yml | 5 + ...ch-bubble-on-image-threads-in-overview.yml | 5 + ...e-hovering-over-images-on-commits-page.yml | 5 + doc/development/pipelines.md | 5 + doc/user/application_security/index.md | 16 +- .../img/policies_maintainer_add_v13_0.png | Bin 22079 -> 0 bytes .../img/policies_maintainer_add_v13_2.png | Bin 0 -> 13419 bytes .../img/policies_maintainer_edit_v13_0.png | Bin 40712 -> 0 bytes .../img/policies_maintainer_edit_v13_2.png | Bin 0 -> 20327 bytes .../compliance/license_compliance/index.md | 41 +++-- lib/api/api_guard.rb | 3 +- lib/api/helpers.rb | 10 ++ lib/gitlab/auth/auth_finders.rb | 22 +++ locale/gitlab.pot | 45 ++++- package.json | 2 +- qa/qa/page/project/settings/incidents.rb | 6 +- qa/qa/page/project/settings/operations.rb | 2 +- .../settings/operations_settings_spec.rb | 5 +- .../components/delete_button_spec.js | 4 +- .../list/__snapshots__/item_spec.js.snap | 14 +- .../toolbar/__snapshots__/index_spec.js.snap | 1 + .../upload/__snapshots__/button_spec.js.snap | 24 ++- .../design_dropzone_spec.js.snap | 170 ++++++++++-------- .../design_version_dropdown_spec.js.snap | 58 ++++-- .../components/upload/design_dropzone_spec.js | 21 ++- .../upload/design_version_dropdown_spec.js | 12 +- .../pages/__snapshots__/index_spec.js.snap | 100 ++++++++--- .../design_management_new/pages/index_spec.js | 52 ++++-- .../__snapshots__/alerts_form_spec.js.snap | 99 ++++++++++ .../incidents_settings_tabs_spec.js.snap | 56 ++++++ .../components/alerts_form_spec.js | 71 ++++++++ .../incidents_settings_tabs_spec.js | 53 ++++++ .../components/charts/single_stat_spec.js | 39 +--- .../components/dashboard_panel_spec.js | 4 +- spec/frontend/monitoring/graph_data.js | 58 +++++- spec/frontend/monitoring/mock_data.js | 30 ---- spec/frontend/monitoring/utils_spec.js | 12 +- spec/lib/gitlab/auth/auth_finders_spec.rb | 73 ++++++++ .../jira/requests/issues/list_service_spec.rb | 6 + .../spam/spam_verdict_service_spec.rb | 12 +- spec/simplecov_env.rb | 5 +- yarn.lock | 8 +- 61 files changed, 1334 insertions(+), 381 deletions(-) create mode 100644 app/assets/javascripts/incidents_settings/components/alerts_form.vue create mode 100644 app/assets/javascripts/incidents_settings/components/incidents_settings_tabs.vue create mode 100644 app/assets/javascripts/incidents_settings/constants.js create mode 100644 app/assets/javascripts/incidents_settings/index.js create mode 100644 changelogs/unreleased/119018-move-alert-settings-to-Vue.yml create mode 100644 changelogs/unreleased/225970-dont-display-speech-bubble-on-image-threads-in-overview.yml create mode 100644 changelogs/unreleased/225971-display-speech-bubble-hovering-over-images-on-commits-page.yml delete mode 100644 doc/user/compliance/license_compliance/img/policies_maintainer_add_v13_0.png create mode 100644 doc/user/compliance/license_compliance/img/policies_maintainer_add_v13_2.png delete mode 100644 doc/user/compliance/license_compliance/img/policies_maintainer_edit_v13_0.png create mode 100644 doc/user/compliance/license_compliance/img/policies_maintainer_edit_v13_2.png create mode 100644 spec/frontend/incidents_settings/components/__snapshots__/alerts_form_spec.js.snap create mode 100644 spec/frontend/incidents_settings/components/__snapshots__/incidents_settings_tabs_spec.js.snap create mode 100644 spec/frontend/incidents_settings/components/alerts_form_spec.js create mode 100644 spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 31fbfd54a52..f508bfa1465 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -40,6 +40,9 @@ .if-merge-request-title-update-caches: &if-merge-request-title-update-caches if: '$CI_MERGE_REQUEST_TITLE =~ /UPDATE CACHE/' +.if-merge-request-title-run-all-rspec: &if-merge-request-title-run-all-rspec + if: '$CI_MERGE_REQUEST_TITLE =~ /RUN ALL RSPEC/' + .if-security-merge-request: &if-security-merge-request if: '$CI_PROJECT_NAMESPACE == "gitlab-org/security" && $CI_MERGE_REQUEST_IID' @@ -440,22 +443,27 @@ .rails:rules:ee-and-foss-migration: rules: - changes: *db-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-and-foss-unit: rules: - changes: *backend-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-and-foss-integration: rules: - changes: *backend-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-and-foss-system: rules: - changes: *code-backstage-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-and-foss-fast_spec_helper: rules: - changes: ["config/**/*"] + - <<: *if-merge-request-title-run-all-rspec .rails:rules:default-refs-code-backstage-qa: rules: @@ -467,24 +475,28 @@ - <<: *if-not-ee when: never - changes: *db-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-only-unit: rules: - <<: *if-not-ee when: never - changes: *backend-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-only-integration: rules: - <<: *if-not-ee when: never - changes: *backend-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:ee-only-system: rules: - <<: *if-not-ee when: never - changes: *code-backstage-patterns + - <<: *if-merge-request-title-run-all-rspec .rails:rules:as-if-foss-migration: rules: @@ -530,6 +542,7 @@ rules: - <<: *if-not-ee when: never + - <<: *if-merge-request-title-run-all-rspec - <<: *if-merge-request changes: *code-backstage-patterns - <<: *if-master-refs @@ -556,6 +569,7 @@ - <<: *if-not-ee when: never - <<: *if-master-schedule-2-hourly + - <<: *if-merge-request-title-run-all-rspec .rails:rules:master-schedule-nightly--code-backstage: rules: diff --git a/app/assets/javascripts/design_management_new/components/delete_button.vue b/app/assets/javascripts/design_management_new/components/delete_button.vue index 1fd902c9ed7..77e1b97a227 100644 --- a/app/assets/javascripts/design_management_new/components/delete_button.vue +++ b/app/assets/javascripts/design_management_new/components/delete_button.vue @@ -1,11 +1,12 @@ diff --git a/app/assets/javascripts/design_management_new/components/list/item.vue b/app/assets/javascripts/design_management_new/components/list/item.vue index eaa641d85d6..b19aef9c22d 100644 --- a/app/assets/javascripts/design_management_new/components/list/item.vue +++ b/app/assets/javascripts/design_management_new/components/list/item.vue @@ -127,7 +127,7 @@ export default { params: { id: filename }, query: $route.query, }" - class="card cursor-pointer text-plain js-design-list-item design-list-item" + class="card cursor-pointer text-plain js-design-list-item design-list-item design-list-item-new" >
diff --git a/app/assets/javascripts/design_management_new/components/upload/button.vue b/app/assets/javascripts/design_management_new/components/upload/button.vue index 68555104a3c..de8a38334ac 100644 --- a/app/assets/javascripts/design_management_new/components/upload/button.vue +++ b/app/assets/javascripts/design_management_new/components/upload/button.vue @@ -1,10 +1,10 @@ diff --git a/app/assets/javascripts/design_management_new/pages/index.vue b/app/assets/javascripts/design_management_new/pages/index.vue index 5fda729098c..272f530bf0d 100644 --- a/app/assets/javascripts/design_management_new/pages/index.vue +++ b/app/assets/javascripts/design_management_new/pages/index.vue @@ -1,5 +1,5 @@