diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-12 00:10:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-12 00:10:36 +0300 |
commit | a6c51b887647aee631ed0144b3816fe696f2321d (patch) | |
tree | ff0a89cd20bf089ada731974b85af5d3c9da7a70 /app/assets/javascripts/pipeline_editor | |
parent | dcacb5daf7941dd2be05e6f688027baae92a6c81 (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.vue | 2 |
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, |