diff options
| author | Natalia Tepluhina <ntepluhina@gitlab.com> | 2019-02-07 18:14:56 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-02-07 18:14:56 +0300 |
| commit | 407fd2edc791c5d159eedad3dfe5521543b50d91 (patch) | |
| tree | 75c526d7e55051720507d955a09a6f1d81a0ccbc /app/assets/javascripts/vue_merge_request_widget/stores | |
| parent | 232ae06a829ba1a7e795564f711e730bd839be41 (diff) | |
Resolve "Override squash commit message"
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 | 2 |
1 files changed, 2 insertions, 0 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 36cac230d9d..58363f632a9 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 @@ -42,6 +42,8 @@ export default class MergeRequestStore { this.mergePipeline = data.merge_pipeline || {}; this.deployments = this.deployments || data.deployments || []; this.postMergeDeployments = this.postMergeDeployments || []; + this.commits = data.commits_without_merge_commits || []; + this.squashCommitMessage = data.default_squash_commit_message; this.initRebase(data); if (data.issues_links) { |