diff options
Diffstat (limited to 'app/assets/javascripts/static_site_editor/services/submit_content_changes.js')
-rw-r--r-- | app/assets/javascripts/static_site_editor/services/submit_content_changes.js | 26 |
1 files changed, 13 insertions, 13 deletions
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 } }); |