diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-06-12 20:51:32 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-06-12 20:51:32 +0300 |
| commit | d78a4465fafe6f0bb5e197649a0721f35a069bbd (patch) | |
| tree | e3d5ff3ff4e8df1c951bdd8ffa58d1de44c19dce /app/assets/javascripts | |
| parent | 09419668dd164fd9a4e74d0fc938be6ee823875c (diff) | |
| parent | 1405b9cd50ba956c866c41dfc5e7a6758e148d0c (diff) | |
Merge branch 'sh-fix-resolve-button-not-available' into 'master'
Fix "Resolve conflicts" button not appearing for some users
Closes #47954
See merge request gitlab-org/gitlab-ce!29535
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue index f6f445c1cef..3df4a777aca 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue @@ -26,7 +26,7 @@ export default { ); }, showResolveButton() { - return this.mr.conflictResolutionPath && this.mr.canMerge; + return this.mr.conflictResolutionPath && this.mr.canPushToSourceBranch; }, showPopover() { return this.showResolveButton && this.mr.sourceBranchProtected; |