diff options
| author | Phil Hughes <me@iamphill.com> | 2018-12-21 10:47:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-01-07 09:17:04 +0000 |
| commit | aae6d174948a238abf05af2d3038d80b5e8750f4 (patch) | |
| tree | 4fd28fc7358cb7602ffd527e152260c90a1f4da0 /app/assets/javascripts/vue_merge_request_widget/stores | |
| parent | 301315f3b3e5ffe43c3de1f7f15e4e3a307c0912 (diff) | |
| download | gitlab-ce-aae6d174948a238abf05af2d3038d80b5e8750f4.tar.gz | |
Disable resolve conflicts for protected branches
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
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 c777bcca0fa..e5a52c6a7f6 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 @@ -29,6 +29,8 @@ export default class MergeRequestStore { this.title = data.title; this.targetBranch = data.target_branch; this.sourceBranch = data.source_branch; + this.sourceBranchProtected = data.source_branch_protected; + this.conflictsDocsPath = data.conflicts_docs_path; this.mergeStatus = data.merge_status; this.commitMessage = data.merge_commit_message; this.shortMergeCommitSha = data.short_merge_commit_sha; |