From bf213f07c8146b7121240af90a07cb4b2ecc41fa Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jul 2020 18:09:27 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../admin/statistics_panel/store/actions.js | 3 - .../admin/statistics_panel/store/getters.js | 4 +- .../stores/modules/batch_comments/actions.js | 3 - .../stores/modules/batch_comments/getters.js | 3 - .../clusters_list/store/actions.js | 3 - .../contributors/stores/actions.js | 4 +- .../contributors/stores/getters.js | 3 - .../gke_cluster/store/actions.js | 3 - .../design_management_new/pages/index.vue | 24 +- app/assets/javascripts/diffs/store/actions.js | 3 - app/assets/javascripts/diffs/store/getters.js | 4 - .../error_tracking/store/actions.js | 2 - .../error_tracking/store/details/actions.js | 3 +- .../error_tracking/store/details/getters.js | 3 +- .../error_tracking/store/list/actions.js | 2 - .../error_tracking_settings/store/actions.js | 3 - .../error_tracking_settings/store/getters.js | 3 - .../error_tracking_settings/utils.js | 2 - .../frequent_items/store/actions.js | 3 - .../frequent_items/store/getters.js | 4 +- .../javascripts/helpers/monitor_helper.js | 3 +- .../ide/stores/modules/branches/actions.js | 2 - .../stores/modules/file_templates/getters.js | 2 - .../stores/modules/merge_requests/actions.js | 2 - .../ide/stores/modules/pipelines/actions.js | 2 - .../ide/stores/modules/pipelines/getters.js | 2 - .../stores/modules/terminal/actions/index.js | 1 - .../ide/stores/modules/terminal/getters.js | 3 +- .../import_projects/store/actions.js | 3 - .../issuables_list/components/issuable.vue | 92 ++++--- app/assets/javascripts/jobs/store/actions.js | 3 - app/assets/javascripts/jobs/store/getters.js | 3 - app/assets/javascripts/logs/stores/actions.js | 3 - .../monitoring/components/charts/heatmap.vue | 2 +- .../monitoring/components/dashboard_panel.vue | 12 +- .../javascripts/monitoring/csv_export.js | 147 +++++++++++ .../monitoring/stores/embed_group/actions.js | 3 +- .../monitoring/stores/embed_group/getters.js | 3 +- .../stores/embed_group/mutation_types.js | 3 +- .../javascripts/notes/stores/actions.js | 3 - .../javascripts/notes/stores/getters.js | 3 - .../operation_settings/store/actions.js | 3 - .../pipelines/stores/test_reports/actions.js | 3 - .../pipelines/stores/test_reports/getters.js | 3 - app/assets/javascripts/pipelines/utils.js | 3 +- .../registry/explorer/stores/actions.js | 2 - .../registry/settings/store/actions.js | 3 - .../related_merge_requests/store/actions.js | 3 - .../releases/stores/modules/list/actions.js | 3 - .../accessibility_report/store/actions.js | 3 - .../accessibility_report/store/getters.js | 3 - .../javascripts/reports/store/actions.js | 3 - .../javascripts/reports/store/getters.js | 4 +- .../javascripts/serverless/store/actions.js | 3 - .../javascripts/serverless/store/getters.js | 3 - app/assets/javascripts/serverless/utils.js | 3 - app/assets/javascripts/snippets/index.js | 2 - .../javascripts/snippets/mixins/snippets.js | 3 +- .../stores/artifacts_list/actions.js | 3 - .../stores/artifacts_list/getters.js | 4 +- .../labels_select_vue/store/actions.js | 3 - .../labels_select_vue/store/getters.js | 3 - .../javascripts/vuex_shared/bindings.js | 3 +- .../vuex_shared/modules/modal/actions.js | 3 - .../design_management/design_list_item.scss | 9 + .../settings/operations_controller.rb | 2 +- app/helpers/operations_helper.rb | 2 +- app/models/application_setting.rb | 2 +- app/models/ci/build.rb | 46 +--- app/models/ci/runner.rb | 2 +- app/models/concerns/approvable_base.rb | 4 + app/models/suggestion.rb | 20 +- app/serializers/suggestion_entity.rb | 18 +- .../viewers/_metrics_dashboard_yml.html.haml | 2 +- ...tokens_optional_encryption-feature-fla.yml | 5 + ...okens_optional_encryption-feature-flag.yml | 5 + .../214627-fix-incorrect-csv-export.yml | 5 + ...age-into-a-comment-also-uploads-design.yml | 5 + .../230459-change-pagerduty-webhook-url.yml | 5 + .../28167-dockerfile-template-rust.yml | 5 + ...d-fix-approvals-for-ee-without-license.yml | 5 + config/locales/devise.en.yml | 2 +- config/routes/project.rb | 4 +- .../geo/replication/database.md | 5 + .../gitlab_self_monitoring_project/index.md | 6 +- doc/api/issues.md | 7 +- doc/api/settings.md | 2 +- doc/api/templates/dockerfiles.md | 4 + doc/development/fe_guide/style/scss.md | 8 + doc/development/geo/framework.md | 9 +- .../testing_guide/frontend_testing.md | 38 ++- doc/operations/metrics/dashboards/index.md | 231 ++++++++---------- doc/operations/metrics/embed.md | 2 +- .../metrics/img/example-dashboard_v13_1.png | Bin 31439 -> 33311 bytes doc/operations/metrics/index.md | 5 +- .../img/compliance_dashboard_v13_2.png | Bin 84922 -> 0 bytes .../img/compliance_dashboard_v13_3.png | Bin 0 -> 41721 bytes .../img/failed_icon_v13_3.png | Bin 0 -> 4118 bytes .../img/success_icon_v13_3.png | Bin 0 -> 4121 bytes .../img/warning_icon_v13_3.png | Bin 0 -> 4095 bytes .../compliance/compliance_dashboard/index.md | 27 +- .../pagerduty_incidents_integration_13_2.png | Bin 34698 -> 43318 bytes doc/user/incident_management/index.md | 9 +- doc/user/project/integrations/prometheus.md | 3 +- lib/api/entities/merge_request_approvals.rb | 3 +- lib/gitlab/ci/build/auto_retry.rb | 57 +++++ locale/gitlab.pot | 10 +- .../issue/check_mentions_for_xss_spec.rb | 15 +- .../settings/operations_controller_spec.rb | 4 +- spec/frontend/batch_comments/mock_data.js | 3 +- .../pages/__snapshots__/index_spec.js.snap | 4 +- spec/frontend/helpers/dom_events_helper.js | 3 +- spec/frontend/helpers/monitor_helper_spec.js | 58 +++-- .../components/issuable_spec.js | 25 +- .../issuables_list/issuable_list_test_data.js | 1 + .../components/charts/heatmap_spec.js | 18 +- .../components/dashboard_panel_spec.js | 11 +- spec/frontend/monitoring/csv_export_spec.js | 126 ++++++++++ spec/frontend/monitoring/graph_data.js | 29 ++- spec/frontend/monitoring/mock_data.js | 77 ------ .../reports/accessibility_report/mock_data.js | 3 +- spec/frontend/serverless/utils.js | 4 +- spec/helpers/operations_helper_spec.rb | 2 +- spec/lib/gitlab/ci/build/auto_retry_spec.rb | 126 ++++++++++ spec/models/ci/build_spec.rb | 106 -------- spec/models/concerns/approvable_base_spec.rb | 34 ++- spec/models/suggestion_spec.rb | 52 +++- .../pagerduty_incidents_spec.rb | 2 +- spec/serializers/suggestion_entity_spec.rb | 82 +------ .../ci/create_pipeline_service_spec.rb | 5 +- vendor/Dockerfile/Rust.Dockerfile | 13 + 131 files changed, 1023 insertions(+), 802 deletions(-) create mode 100644 app/assets/javascripts/monitoring/csv_export.js create mode 100644 changelogs/unreleased/214382-remove-application_settings_tokens_optional_encryption-feature-fla.yml create mode 100644 changelogs/unreleased/214382-remove-ci_runners_tokens_optional_encryption-feature-flag.yml create mode 100644 changelogs/unreleased/214627-fix-incorrect-csv-export.yml create mode 100644 changelogs/unreleased/229588-pasting-an-image-into-a-comment-also-uploads-design.yml create mode 100644 changelogs/unreleased/230459-change-pagerduty-webhook-url.yml create mode 100644 changelogs/unreleased/28167-dockerfile-template-rust.yml create mode 100644 changelogs/unreleased/id-fix-approvals-for-ee-without-license.yml delete mode 100644 doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_2.png create mode 100644 doc/user/compliance/compliance_dashboard/img/compliance_dashboard_v13_3.png create mode 100644 doc/user/compliance/compliance_dashboard/img/failed_icon_v13_3.png create mode 100644 doc/user/compliance/compliance_dashboard/img/success_icon_v13_3.png create mode 100644 doc/user/compliance/compliance_dashboard/img/warning_icon_v13_3.png create mode 100644 lib/gitlab/ci/build/auto_retry.rb create mode 100644 spec/frontend/monitoring/csv_export_spec.js create mode 100644 spec/lib/gitlab/ci/build/auto_retry_spec.rb create mode 100644 vendor/Dockerfile/Rust.Dockerfile diff --git a/app/assets/javascripts/admin/statistics_panel/store/actions.js b/app/assets/javascripts/admin/statistics_panel/store/actions.js index 537025f524c..ac10aa07c11 100644 --- a/app/assets/javascripts/admin/statistics_panel/store/actions.js +++ b/app/assets/javascripts/admin/statistics_panel/store/actions.js @@ -23,6 +23,3 @@ export const receiveStatisticsError = ({ commit }, error) => { commit(types.RECEIVE_STATISTICS_ERROR, error); createFlash(s__('AdminDashboard|Error loading the statistics. Please try again')); }; - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/admin/statistics_panel/store/getters.js b/app/assets/javascripts/admin/statistics_panel/store/getters.js index 24437bc76bf..2aa34b8f38e 100644 --- a/app/assets/javascripts/admin/statistics_panel/store/getters.js +++ b/app/assets/javascripts/admin/statistics_panel/store/getters.js @@ -3,6 +3,7 @@ * and returns an array of the following form: * [{ key: "forks", label: "Forks", value: 50 }] */ +// eslint-disable-next-line import/prefer-default-export export const getStatistics = state => labels => Object.keys(labels).map(key => { const result = { @@ -12,6 +13,3 @@ export const getStatistics = state => labels => }; return result; }); - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js index 1ef012696c5..d06efaa25de 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/actions.js @@ -146,6 +146,3 @@ export const expandAllDiscussions = ({ dispatch, state }) => export const toggleResolveDiscussion = ({ commit }, draftId) => { commit(types.TOGGLE_RESOLVE_DISCUSSION, draftId); }; - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/getters.js b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/getters.js index 43f43c983aa..22ae6c2e970 100644 --- a/app/assets/javascripts/batch_comments/stores/modules/batch_comments/getters.js +++ b/app/assets/javascripts/batch_comments/stores/modules/batch_comments/getters.js @@ -82,6 +82,3 @@ export const isPublishingDraft = state => draftId => state.currentlyPublishingDrafts.indexOf(draftId) !== -1; export const sortedDrafts = state => [...state.drafts].sort((a, b) => a.id > b.id); - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/clusters_list/store/actions.js b/app/assets/javascripts/clusters_list/store/actions.js index dddcfb3d975..011d7391e7d 100644 --- a/app/assets/javascripts/clusters_list/store/actions.js +++ b/app/assets/javascripts/clusters_list/store/actions.js @@ -76,6 +76,3 @@ export const fetchClusters = ({ state, commit, dispatch }) => { export const setPage = ({ commit }, page) => { commit(types.SET_PAGE, page); }; - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/contributors/stores/actions.js b/app/assets/javascripts/contributors/stores/actions.js index 4138ff24f1d..aefb132efc3 100644 --- a/app/assets/javascripts/contributors/stores/actions.js +++ b/app/assets/javascripts/contributors/stores/actions.js @@ -3,6 +3,7 @@ import { __ } from '~/locale'; import service from '../services/contributors_service'; import * as types from './mutation_types'; +// eslint-disable-next-line import/prefer-default-export export const fetchChartData = ({ commit }, endpoint) => { commit(types.SET_LOADING_STATE, true); @@ -15,6 +16,3 @@ export const fetchChartData = ({ commit }, endpoint) => { }) .catch(() => flash(__('An error occurred while loading chart data'))); }; - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/contributors/stores/getters.js b/app/assets/javascripts/contributors/stores/getters.js index 9b0def9b3ca..9022179d6c7 100644 --- a/app/assets/javascripts/contributors/stores/getters.js +++ b/app/assets/javascripts/contributors/stores/getters.js @@ -28,6 +28,3 @@ export const parsedData = state => { byAuthorEmail, }; }; - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/create_cluster/gke_cluster/store/actions.js b/app/assets/javascripts/create_cluster/gke_cluster/store/actions.js index f05ad7773a2..f0c41d1d230 100644 --- a/app/assets/javascripts/create_cluster/gke_cluster/store/actions.js +++ b/app/assets/javascripts/create_cluster/gke_cluster/store/actions.js @@ -90,6 +90,3 @@ export const fetchMachineTypes = ({ commit, state }) => mutation: types.SET_MACHINE_TYPES, payloadKey: 'items', }); - -// prevent babel-plugin-rewire from generating an invalid default during karma tests -export default () => {}; diff --git a/app/assets/javascripts/design_management_new/pages/index.vue b/app/assets/javascripts/design_management_new/pages/index.vue index 2a100fae280..700fa903a9c 100644 --- a/app/assets/javascripts/design_management_new/pages/index.vue +++ b/app/assets/javascripts/design_management_new/pages/index.vue @@ -246,28 +246,28 @@ export default { this.onUploadDesign([newFile]); } }, - toggleOnPasteListener(route) { - if (route === DESIGNS_ROUTE_NAME) { - document.addEventListener('paste', this.onDesignPaste); - } else { - document.removeEventListener('paste', this.onDesignPaste); - } + toggleOnPasteListener() { + document.addEventListener('paste', this.onDesignPaste); + }, + toggleOffPasteListener() { + document.removeEventListener('paste', this.onDesignPaste); }, }, beforeRouteUpdate(to, from, next) { - this.toggleOnPasteListener(to.name); this.selectedDesigns = []; next(); }, - beforeRouteLeave(to, from, next) { - this.toggleOnPasteListener(to.name); - next(); - }, };