Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-12 00:10:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-12 00:10:36 +0300
commita6c51b887647aee631ed0144b3816fe696f2321d (patch)
treeff0a89cd20bf089ada731974b85af5d3c9da7a70 /app/assets/javascripts/pipeline_editor
parentdcacb5daf7941dd2be05e6f688027baae92a6c81 (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/text_editor.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/pipeline_editor/components/text_editor.vue b/app/assets/javascripts/pipeline_editor/components/text_editor.vue
index 6ef0ef591d8..fae08ca89f4 100644
--- a/app/assets/javascripts/pipeline_editor/components/text_editor.vue
+++ b/app/assets/javascripts/pipeline_editor/components/text_editor.vue
@@ -6,8 +6,8 @@ export default {
components: {
EditorLite,
},
- inheritAttrs: false,
inject: ['projectPath', 'projectNamespace'],
+ inheritAttrs: false,
props: {
ciConfigPath: {
type: String,