Commit 592dce18b549cd29933603f53f1ab8fb9f33840e
1 parent
0f055197
Exists in
spb-stable
and in
3 other branches
Always show merge status
Always show the merge status of a merge request, even if the user has no permission to do the actual merging. Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status
Showing
1 changed file
with
4 additions
and
1 deletions
Show diff stats
app/views/projects/merge_requests/show/_mr_accept.html.haml
| @@ -4,7 +4,10 @@ | @@ -4,7 +4,10 @@ | ||
| 4 | %strong Archived projects cannot be committed to! | 4 | %strong Archived projects cannot be committed to! |
| 5 | - else | 5 | - else |
| 6 | .bs-callout | 6 | .bs-callout |
| 7 | - %strong You don't have permission to merge this MR | 7 | + .automerge_widget.cannot_be_merged.hide |
| 8 | + %strong This can't be merged automatically, even if it could be merged you don't have the permission to do so. | ||
| 9 | + .automerge_widget.can_be_merged.hide | ||
| 10 | + %strong This can be merged automatically but you don't have the permission to do so. | ||
| 8 | 11 | ||
| 9 | 12 | ||
| 10 | - if @show_merge_controls | 13 | - if @show_merge_controls |