Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue b/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue
index d900cfcdf2b..c16c29f3222 100644
--- a/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue
+++ b/app/assets/javascripts/pipeline_editor/pipeline_editor_app.vue
@@ -152,6 +152,9 @@ export default {
       update(data) {
         return data.project?.ciTemplate?.content || '';
       },
+      result({ data }) {
+        this.updateCiConfig(data.project?.ciTemplate?.content || '');
+      },
       error() {
         this.reportFailure(LOAD_FAILURE_UNKNOWN);
       },
@@ -170,9 +173,6 @@ export default {
     isEmpty() {
       return this.currentCiFileContent === '';
     },
-    templateOrCurrentContent() {
-      return this.isNewCiConfigFile ? this.starterTemplate : this.currentCiFileContent;
-    },
   },
   i18n: {
     tabEdit: s__('Pipelines|Edit'),
@@ -280,7 +280,7 @@ export default {
       />
       <pipeline-editor-home
         :ci-config-data="ciConfigData"
-        :ci-file-content="templateOrCurrentContent"
+        :ci-file-content="currentCiFileContent"
         :is-new-ci-config-file="isNewCiConfigFile"
         @commit="updateOnCommit"
         @resetContent="resetContent"