From fc1df8c8307fc5022f9e8aae04164c089d8fdf2e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 17 Mar 2020 09:09:20 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .vale.ini | 39 +-- app/assets/javascripts/api.js | 6 +- .../components/enable_review_app_button.vue | 8 +- .../ide/components/commit_sidebar/list.vue | 2 +- .../ide/components/pipelines/list.vue | 3 +- .../javascripts/lib/utils/icon_utils.js | 44 +++- .../page_bundles/_ide_monaco_overrides.scss | 146 ++++++++++++ app/assets/stylesheets/page_bundles/ide.scss | 224 ++---------------- app/services/system_note_service.rb | 4 + .../system_notes/issuables_service.rb | 6 + changelogs/unreleased/stop_environments.yml | 5 + .../styles => .vale}/gitlab/Contractions.yml | 0 .../styles => .vale}/gitlab/FirstPerson.yml | 0 .../gitlab/InternalLinkExtension.yml | 0 .../styles => .vale}/gitlab/LatinTerms.yml | 0 .../styles => .vale}/gitlab/OxfordComma.yml | 0 .../styles => .vale}/gitlab/RelativeLinks.yml | 0 .../gitlab/SentenceSpacing.yml | 0 .../styles => .vale}/gitlab/Substitutions.yml | 0 .../img/enable_review_app_v12_8.png | Bin 17151 -> 14013 bytes .../contributing/issue_workflow.md | 2 + doc/development/event_tracking/backend.md | 5 + doc/development/event_tracking/frontend.md | 5 + doc/development/event_tracking/index.md | 5 + doc/policy/maintenance.md | 10 +- .../ci/templates/Jobs/Deploy.gitlab-ci.yml | 1 + .../import_export/group/tree_restorer.rb | 25 +- .../import_export/json/legacy_reader.rb | 104 ++++++++ .../import_export/project/tree_loader.rb | 74 ------ .../import_export/project/tree_restorer.rb | 22 +- lib/gitlab/import_export/reader.rb | 8 + .../import_export/relation_tree_restorer.rb | 34 +-- .../import_export/relation_tree_saver.rb | 2 +- .../import_export/invalid_json/project.json | 3 + spec/frontend/__mocks__/mousetrap/index.js | 6 + .../diffs/components/app_spec.js | 91 +++---- spec/frontend/diffs/create_diffs_store.js | 15 ++ .../pipelines/__snapshots__/list_spec.js.snap | 1 + spec/frontend/lib/utils/icon_utils_spec.js | 72 ++++-- .../mocks/ce/diffs/workers/tree_worker.js | 8 + spec/javascripts/diffs/create_diffs_store.js | 16 +- .../import_export/json/legacy_reader_spec.rb | 149 ++++++++++++ .../import_export/project/tree_loader_spec.rb | 49 ---- .../project/tree_restorer_spec.rb | 3 +- .../relation_tree_restorer_spec.rb | 27 ++- spec/services/system_note_service_spec.rb | 10 + .../system_notes/issuables_service_spec.rb | 12 + 47 files changed, 719 insertions(+), 527 deletions(-) create mode 100644 app/assets/stylesheets/page_bundles/_ide_monaco_overrides.scss create mode 100644 changelogs/unreleased/stop_environments.yml rename doc/{.linting/vale/styles => .vale}/gitlab/Contractions.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/FirstPerson.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/InternalLinkExtension.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/LatinTerms.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/OxfordComma.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/RelativeLinks.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/SentenceSpacing.yml (100%) rename doc/{.linting/vale/styles => .vale}/gitlab/Substitutions.yml (100%) create mode 100644 doc/development/event_tracking/backend.md create mode 100644 doc/development/event_tracking/frontend.md create mode 100644 doc/development/event_tracking/index.md create mode 100644 lib/gitlab/import_export/json/legacy_reader.rb delete mode 100644 lib/gitlab/import_export/project/tree_loader.rb create mode 100644 spec/fixtures/lib/gitlab/import_export/invalid_json/project.json create mode 100644 spec/frontend/__mocks__/mousetrap/index.js rename spec/{javascripts => frontend}/diffs/components/app_spec.js (90%) create mode 100644 spec/frontend/diffs/create_diffs_store.js create mode 100644 spec/frontend/mocks/ce/diffs/workers/tree_worker.js create mode 100644 spec/lib/gitlab/import_export/json/legacy_reader_spec.rb delete mode 100644 spec/lib/gitlab/import_export/project/tree_loader_spec.rb diff --git a/.vale.ini b/.vale.ini index 89a669ec7ff..13b198b9148 100644 --- a/.vale.ini +++ b/.vale.ini @@ -1,40 +1,9 @@ -# Vale configuration file, taken from https://errata-ai.github.io/vale/config/ +# Vale configuration file. +# +# For more information, see https://errata-ai.gitbook.io/vale/getting-started/configuration. -# The relative path to the folder containing linting rules (styles) -# ----------------------------------------------------------------- -StylesPath = doc/.linting/vale/styles - -# Minimum alert level -# ------------------- -# The minimum alert level to display (suggestion, warning, or error). -# If integrated into CI, builds fail by default on error-level alerts, -# unless you execute Vale with the --no-exit flag +StylesPath = doc/.vale MinAlertLevel = suggestion -# Should Vale parse any file formats other than .md files as Markdown? -# -------------------------------------------------------------------- -[formats] -mdx = md - -# What file types should Vale test? -# ---------------------------------- [*.md] - -# Styles to load -# -------------- -# What styles, located in the StylesPath folder, should Vale load? -# Vale also currently includes write-good, proselint, joblint, and vale BasedOnStyles = gitlab - -# Enabling or disabling specific rules in a style -# ----------------------------------------------- -# To disable a rule in an enabled style, use the following format: -# {style}.{filename} = NO -# To enable a single rule in a disabled style, use the following format: -# vale.Editorializing = YES - -# Altering the severity of a rule in a style -# ------------------------------------------ -# To change the reporting level (suggestion, warning, error) of a rule, -# use the following format: {style}.{filename} = {level} -# vale.Hedging = error diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index dc6ea148047..022d79ecf49 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -1,5 +1,3 @@ -import $ from 'jquery'; -import _ from 'underscore'; import axios from './lib/utils/axios_utils'; import { joinPaths } from './lib/utils/url_utility'; import flash from '~/flash'; @@ -70,7 +68,7 @@ const Api = { }, // Return groups list. Filtered by query - groups(query, options, callback = $.noop) { + groups(query, options, callback = () => {}) { const url = Api.buildUrl(Api.groupsPath); return axios .get(url, { @@ -108,7 +106,7 @@ const Api = { }, // Return projects list. Filtered by query - projects(query, options, callback = _.noop) { + projects(query, options, callback = () => {}) { const url = Api.buildUrl(Api.projectsPath); const defaults = { search: query, diff --git a/app/assets/javascripts/environments/components/enable_review_app_button.vue b/app/assets/javascripts/environments/components/enable_review_app_button.vue index 2f9e9cb628f..8fbbc5189bf 100644 --- a/app/assets/javascripts/environments/components/enable_review_app_button.vue +++ b/app/assets/javascripts/environments/components/enable_review_app_button.vue @@ -26,15 +26,17 @@ export default { modalInfo: { closeText: s__('EnableReviewApp|Close'), copyToClipboardText: s__('EnableReviewApp|Copy snippet text'), - copyString: `deploy_review + copyString: `deploy_review: stage: deploy script: - echo "Deploy a review app" environment: name: review/$CI_COMMIT_REF_NAME url: https://$CI_ENVIRONMENT_SLUG.example.com - only: branches - except: master`, + only: + - branches + except: + - master`, id: 'enable-review-app-info', title: s__('ReviewApp|Enable Review App'), }, diff --git a/app/assets/javascripts/ide/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue index 2e273d45506..a15e22d4742 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/list.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue @@ -94,7 +94,7 @@ export default { data-boundary="viewport" @click="openDiscardModal" > - + diff --git a/app/assets/javascripts/ide/components/pipelines/list.vue b/app/assets/javascripts/ide/components/pipelines/list.vue index b61d0a47795..3a63fc32639 100644 --- a/app/assets/javascripts/ide/components/pipelines/list.vue +++ b/app/assets/javascripts/ide/components/pipelines/list.vue @@ -59,7 +59,7 @@ export default {