From d72be033dbc66b5e77b49f050b4f87e5df57c873 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 22 Dec 2020 15:09:51 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .../components/lint/ci_lint.vue | 48 ++++++++ .../components/lint/ci_lint_results.vue | 16 ++- .../components/lint/ci_lint_results_value.vue | 20 ++-- .../javascripts/pipeline_editor/index.js | 12 +- .../pipeline_editor/pipeline_editor_app.vue | 12 +- .../projects/default_project_templates.js | 4 + .../pager_duty_incidents_controller.rb | 2 +- app/graphql/types/merge_request_type.rb | 2 +- .../pager_duty/process_webhook_service.rb | 13 ++- .../ci/pipeline_editor/show.html.haml | 1 + changelogs/unreleased/lmca-kotlin-native.yml | 5 + .../postgresql/replication_and_failover.md | 37 ++++++ .../graphql/reference/gitlab_schema.graphql | 5 + doc/api/graphql/reference/gitlab_schema.json | 14 +++ doc/api/graphql/reference/index.md | 1 + doc/development/fe_guide/style/vue.md | 84 ++++++++++---- doc/development/fe_guide/vue.md | 107 +++++++++++++----- doc/development/foreign_keys.md | 2 + doc/user/project/labels.md | 2 +- .../merge_requests/squash_and_merge.md | 2 +- .../background_migration_helpers.rb | 10 ++ lib/gitlab/project_template.rb | 3 +- locale/gitlab.pot | 21 +++- package.json | 2 +- spec/features/projects/ci/lint_spec.rb | 4 +- .../components/lint/ci_lint_results_spec.js | 26 +++++ .../components/lint/ci_lint_spec.js | 80 +++++++++++++ spec/frontend/pipeline_editor/mock_data.js | 94 ++++++++++++++- .../pipeline_editor_app_spec.js | 25 ++-- spec/lib/gitlab/project_template_spec.rb | 1 + .../pagerduty_incidents_spec.rb | 2 +- .../process_webhook_service_spec.rb | 2 +- .../kotlin_native_linux.tar.gz | Bin 0 -> 60265 bytes yarn.lock | 12 +- 34 files changed, 554 insertions(+), 117 deletions(-) create mode 100644 app/assets/javascripts/pipeline_editor/components/lint/ci_lint.vue create mode 100644 changelogs/unreleased/lmca-kotlin-native.yml create mode 100644 spec/frontend/pipeline_editor/components/lint/ci_lint_spec.js create mode 100644 vendor/project_templates/kotlin_native_linux.tar.gz diff --git a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint.vue b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint.vue new file mode 100644 index 00000000000..22f734be5aa --- /dev/null +++ b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint.vue @@ -0,0 +1,48 @@ + + + diff --git a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue index 0d1c214c5b1..14b0a38da58 100644 --- a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue +++ b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results.vue @@ -10,11 +10,11 @@ const thBorderColor = 'gl-border-gray-100!'; export default { correct: { variant: 'success', - text: __('syntax is correct.'), + text: __('Syntax is correct.'), }, incorrect: { variant: 'danger', - text: __('syntax is incorrect.'), + text: __('Syntax is incorrect.'), }, includesText: __( 'CI configuration validated, including all configuration added with the %{codeStart}includes%{codeEnd} keyword. %{link}', @@ -48,19 +48,23 @@ export default { }, jobs: { type: Array, - required: true, + required: false, + default: () => [], }, errors: { type: Array, - required: true, + required: false, + default: () => [], }, warnings: { type: Array, - required: true, + required: false, + default: () => [], }, dryRun: { type: Boolean, - required: true, + required: false, + default: false, }, lintHelpPagePath: { type: String, diff --git a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_value.vue b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_value.vue index 4929c3206df..6c7e03e4920 100644 --- a/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_value.vue +++ b/app/assets/javascripts/pipeline_editor/components/lint/ci_lint_results_value.vue @@ -14,7 +14,7 @@ export default { }, computed: { tagList() { - return this.item.tagList.join(', '); + return this.item.tagList?.join(', '); }, onlyPolicy() { return this.item.only ? this.item.only.refs.join(', ') : this.item.only; @@ -26,15 +26,15 @@ export default { return { beforeScript: { show: !isEmpty(this.item.beforeScript), - content: this.item.beforeScript.join('\n'), + content: this.item.beforeScript?.join('\n'), }, script: { show: !isEmpty(this.item.script), - content: this.item.script.join('\n'), + content: this.item.script?.join('\n'), }, afterScript: { show: !isEmpty(this.item.afterScript), - content: this.item.afterScript.join('\n'), + content: this.item.afterScript?.join('\n'), }, }; }, @@ -43,7 +43,7 @@ export default {