Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

5 files changed, 18 insertions, 16 deletions

diff --git a/app/assets/javascripts/static_site_editor/constants.js b/app/assets/javascripts/static_site_editor/constants.js
index 5fb20b00705..b08bf26e1dc 100644
--- a/app/assets/javascripts/static_site_editor/constants.js
+++ b/app/assets/javascripts/static_site_editor/constants.js
@@ -1,7 +1,6 @@
 import { s__, __ } from '~/locale';
 
 export const BRANCH_SUFFIX_COUNT = 8;
-export const DEFAULT_TARGET_BRANCH = 'master';
 export const ISSUABLE_TYPE = 'merge_request';
 
 export const SUBMIT_CHANGES_BRANCH_ERROR = s__('StaticSiteEditor|Branch could not be created.');
diff --git a/app/assets/javascripts/static_site_editor/graphql/resolvers/submit_content_changes.js b/app/assets/javascripts/static_site_editor/graphql/resolvers/submit_content_changes.js
index 0b74c99b319..e9f1828bff8 100644
--- a/app/assets/javascripts/static_site_editor/graphql/resolvers/submit_content_changes.js
+++ b/app/assets/javascripts/static_site_editor/graphql/resolvers/submit_content_changes.js
@@ -9,6 +9,7 @@ const submitContentChangesResolver = (
       project: projectId,
       username,
       sourcePath,
+      targetBranch,
       content,
       images,
       mergeRequestMeta,
@@ -21,6 +22,7 @@ const submitContentChangesResolver = (
     projectId,
     username,
     sourcePath,
+    targetBranch,
     content,
     images,
     mergeRequestMeta,
diff --git a/app/assets/javascripts/static_site_editor/pages/home.vue b/app/assets/javascripts/static_site_editor/pages/home.vue
index 22f80ead74b..49a2ca03ace 100644
--- a/app/assets/javascripts/static_site_editor/pages/home.vue
+++ b/app/assets/javascripts/static_site_editor/pages/home.vue
@@ -111,6 +111,7 @@ export default {
               project: this.appData.project,
               username: this.appData.username,
               sourcePath: this.appData.sourcePath,
+              targetBranch: this.appData.branch,
               content: this.content,
               formattedMarkdown: this.formattedMarkdown,
               images: this.images,
diff --git a/app/assets/javascripts/static_site_editor/services/generate_branch_name.js b/app/assets/javascripts/static_site_editor/services/generate_branch_name.js
index f45ad616332..cbf03a41ce2 100644
--- a/app/assets/javascripts/static_site_editor/services/generate_branch_name.js
+++ b/app/assets/javascripts/static_site_editor/services/generate_branch_name.js
@@ -1,8 +1,8 @@
-import { BRANCH_SUFFIX_COUNT, DEFAULT_TARGET_BRANCH } from '../constants';
+import { BRANCH_SUFFIX_COUNT } from '../constants';
 
 const generateBranchSuffix = () => `${Date.now()}`.substr(BRANCH_SUFFIX_COUNT);
 
-const generateBranchName = (username, targetBranch = DEFAULT_TARGET_BRANCH) =>
+const generateBranchName = (username, targetBranch) =>
   `${username}-${targetBranch}-patch-${generateBranchSuffix()}`;
 
 export default generateBranchName;
diff --git a/app/assets/javascripts/static_site_editor/services/submit_content_changes.js b/app/assets/javascripts/static_site_editor/services/submit_content_changes.js
index 6391cfd6cc2..ecb7f60a421 100644
--- a/app/assets/javascripts/static_site_editor/services/submit_content_changes.js
+++ b/app/assets/javascripts/static_site_editor/services/submit_content_changes.js
@@ -4,7 +4,6 @@ import generateBranchName from '~/static_site_editor/services/generate_branch_na
 import Tracking from '~/tracking';
 
 import {
-  DEFAULT_TARGET_BRANCH,
   SUBMIT_CHANGES_BRANCH_ERROR,
   SUBMIT_CHANGES_COMMIT_ERROR,
   SUBMIT_CHANGES_MERGE_REQUEST_ERROR,
@@ -16,9 +15,9 @@ import {
   DEFAULT_FORMATTING_CHANGES_COMMIT_DESCRIPTION,
 } from '../constants';
 
-const createBranch = (projectId, branch) =>
+const createBranch = (projectId, branch, targetBranch) =>
   Api.createBranch(projectId, {
-    ref: DEFAULT_TARGET_BRANCH,
+    ref: targetBranch,
     branch,
   }).catch(() => {
     throw new Error(SUBMIT_CHANGES_BRANCH_ERROR);
@@ -73,13 +72,7 @@ const commit = (projectId, message, branch, actions) => {
   });
 };
 
-const createMergeRequest = (
-  projectId,
-  title,
-  description,
-  sourceBranch,
-  targetBranch = DEFAULT_TARGET_BRANCH,
-) => {
+const createMergeRequest = (projectId, title, description, sourceBranch, targetBranch) => {
   Tracking.event(document.body.dataset.page, TRACKING_ACTION_CREATE_MERGE_REQUEST);
   Api.trackRedisCounterEvent(USAGE_PING_TRACKING_ACTION_CREATE_MERGE_REQUEST);
 
@@ -100,16 +93,17 @@ const submitContentChanges = ({
   username,
   projectId,
   sourcePath,
+  targetBranch,
   content,
   images,
   mergeRequestMeta,
   formattedMarkdown,
 }) => {
-  const branch = generateBranchName(username);
+  const branch = generateBranchName(username, targetBranch);
   const { title: mergeRequestTitle, description: mergeRequestDescription } = mergeRequestMeta;
   const meta = {};
 
-  return createBranch(projectId, branch)
+  return createBranch(projectId, branch, targetBranch)
     .then(({ data: { web_url: url } }) => {
       const message = `${DEFAULT_FORMATTING_CHANGES_COMMIT_MESSAGE}\n\n${DEFAULT_FORMATTING_CHANGES_COMMIT_DESCRIPTION}`;
 
@@ -133,7 +127,13 @@ const submitContentChanges = ({
     .then(({ data: { short_id: label, web_url: url } }) => {
       Object.assign(meta, { commit: { label, url } });
 
-      return createMergeRequest(projectId, mergeRequestTitle, mergeRequestDescription, branch);
+      return createMergeRequest(
+        projectId,
+        mergeRequestTitle,
+        mergeRequestDescription,
+        branch,
+        targetBranch,
+      );
     })
     .then(({ data: { iid: label, web_url: url } }) => {
       Object.assign(meta, { mergeRequest: { label: label.toString(), url } });