diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-02-06 12:33:11 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-06 12:33:11 +0000 |
| commit | 2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a (patch) | |
| tree | 47615a573f6dc932353f0f6695cd4fcd050b1201 /app/assets/javascripts/vue_merge_request_widget/stores | |
| parent | 5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1 (diff) | |
| download | gitlab-ce-2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a.tar.gz | |
Allow custom squash commit messages
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/stores')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index ab194e84ab4..36cac230d9d 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -32,10 +32,10 @@ export default class MergeRequestStore { this.sourceBranchProtected = data.source_branch_protected; this.conflictsDocsPath = data.conflicts_docs_path; this.mergeStatus = data.merge_status; - this.commitMessage = data.merge_commit_message; + this.commitMessage = data.default_merge_commit_message; this.shortMergeCommitSha = data.short_merge_commit_sha; this.mergeCommitSha = data.merge_commit_sha; - this.commitMessageWithDescription = data.merge_commit_message_with_description; + this.commitMessageWithDescription = data.default_merge_commit_message_with_description; this.commitsCount = data.commits_count; this.divergedCommitsCount = data.diverged_commits_count; this.pipeline = data.pipeline || {}; |