diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-03 21:07:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-03 21:07:53 +0300 |
| commit | 8bdfdd49b38f822462ca25e1e6f4a25d40dedb85 (patch) | |
| tree | cfb5845be863f67bdd61ab76a5271a560ebda999 /app/assets/javascripts/pipeline_editor | |
| parent | 62098c11d130722cca6d4864b3a5257bc3fa8fa1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pipeline_editor')
| -rw-r--r-- | app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue b/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue index 853e839a7ab..42e2d34fa3a 100644 --- a/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue +++ b/app/assets/javascripts/pipeline_editor/components/editor/ci_config_merged_preview.vue @@ -46,7 +46,9 @@ export default { :value="mergedYaml" :file-name="ciConfigPath" :file-global-id="fileGlobalId" - :editor-options="{ readOnly: true }" + :editor-options="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ { + readOnly: true, + } /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */" v-on="$listeners" /> </div> diff --git a/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue b/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue index 25a78aab933..1f2fdb7ce36 100644 --- a/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue +++ b/app/assets/javascripts/pipeline_editor/components/header/pipeline_editor_mini_graph.vue @@ -87,7 +87,9 @@ export default { <div v-if="pipelineStages.length > 0" class="stage-cell gl-mr-5"> <linked-pipelines-mini-list v-if="upstreamPipeline" - :triggered-by="[upstreamPipeline]" + :triggered-by="/* eslint-disable @gitlab/vue-no-new-non-primitive-in-template */ [ + upstreamPipeline, + ] /* eslint-enable @gitlab/vue-no-new-non-primitive-in-template */" data-testid="pipeline-editor-mini-graph-upstream" /> <pipeline-mini-graph class="gl-display-inline" :stages="pipelineStages" /> |