Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 20 deletions

diff --git a/app/assets/javascripts/pipeline_editor/components/commit/commit_form.vue b/app/assets/javascripts/pipeline_editor/components/commit/commit_form.vue
index 8536db78dfb..d9da238358f 100644
--- a/app/assets/javascripts/pipeline_editor/components/commit/commit_form.vue
+++ b/app/assets/javascripts/pipeline_editor/components/commit/commit_form.vue
@@ -54,15 +54,15 @@ export default {
     return {
       message: this.defaultMessage,
       openMergeRequest: false,
-      targetBranch: this.currentBranch,
+      sourceBranch: this.currentBranch,
     };
   },
   computed: {
     isCommitFormFilledOut() {
-      return this.message && this.targetBranch;
+      return this.message && this.sourceBranch;
     },
-    isCurrentBranchTarget() {
-      return this.targetBranch === this.currentBranch;
+    isCurrentBranchSourceBranch() {
+      return this.sourceBranch === this.currentBranch;
     },
     isSubmitDisabled() {
       return !this.isCommitFormFilledOut || (!this.hasUnsavedChanges && !this.isNewCiConfigFile);
@@ -79,7 +79,7 @@ export default {
     onSubmit() {
       this.$emit('submit', {
         message: this.message,
-        targetBranch: this.targetBranch,
+        sourceBranch: this.sourceBranch,
         openMergeRequest: this.openMergeRequest,
       });
     },
@@ -93,7 +93,7 @@ export default {
   },
   i18n: {
     commitMessage: __('Commit message'),
-    targetBranch: __('Target Branch'),
+    sourceBranch: __('Branch'),
     startMergeRequest: __('Start a %{new_merge_request} with these changes'),
     newMergeRequest: __('new merge request'),
     commitChanges: __('Commit changes'),
@@ -120,20 +120,20 @@ export default {
         />
       </gl-form-group>
       <gl-form-group
-        id="target-branch-group"
-        :label="$options.i18n.targetBranch"
+        id="source-branch-group"
+        :label="$options.i18n.sourceBranch"
         label-cols-sm="2"
-        label-for="target-branch-field"
+        label-for="source-branch-field"
       >
         <gl-form-input
-          id="target-branch-field"
-          v-model="targetBranch"
+          id="source-branch-field"
+          v-model="sourceBranch"
           class="gl-font-monospace!"
           required
-          data-qa-selector="target_branch_field"
+          data-qa-selector="source_branch_field"
         />
         <gl-form-checkbox
-          v-if="!isCurrentBranchTarget"
+          v-if="!isCurrentBranchSourceBranch"
           v-model="openMergeRequest"
           data-testid="new-mr-checkbox"
           data-qa-selector="new_mr_checkbox"
diff --git a/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue b/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue
index 4ef598d6ff3..9cbf60b1c8f 100644
--- a/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue
+++ b/app/assets/javascripts/pipeline_editor/components/commit/commit_section.vue
@@ -75,7 +75,7 @@ export default {
     },
   },
   methods: {
-    async onCommitSubmit({ message, targetBranch, openMergeRequest }) {
+    async onCommitSubmit({ message, sourceBranch, openMergeRequest }) {
       this.isSaving = true;
 
       try {
@@ -88,7 +88,7 @@ export default {
           variables: {
             action: this.action,
             projectPath: this.projectFullPath,
-            branch: targetBranch,
+            branch: sourceBranch,
             startBranch: this.currentBranch,
             message,
             filePath: this.ciConfigPath,
@@ -104,12 +104,11 @@ export default {
         if (errors?.length) {
           this.$emit('showError', { type: COMMIT_FAILURE, reasons: errors });
         } else {
-          const commitBranch = targetBranch;
           const params = openMergeRequest
             ? {
                 type: COMMIT_SUCCESS_WITH_REDIRECT,
                 params: {
-                  sourceBranch: commitBranch,
+                  sourceBranch,
                   targetBranch: this.currentBranch,
                 },
               }
@@ -119,10 +118,10 @@ export default {
             ...params,
           });
 
-          this.updateLastCommitBranch(targetBranch);
-          this.updateCurrentBranch(targetBranch);
+          this.updateLastCommitBranch(sourceBranch);
+          this.updateCurrentBranch(sourceBranch);
 
-          if (this.currentBranch === targetBranch) {
+          if (this.currentBranch === sourceBranch) {
             this.$emit('updateCommitSha');
           }
         }