diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-03-27 14:32:32 +0100 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-03-27 15:32:28 +0100 |
| commit | 592dce18b549cd29933603f53f1ab8fb9f33840e (patch) | |
| tree | 6b307231143fabaa9051446bd3802d824124ba78 | |
| parent | 0f055197776275cdf55538469a07cf8d5e13ad24 (diff) | |
| download | gitlab-ce-592dce18b549cd29933603f53f1ab8fb9f33840e.tar.gz | |
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
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_accept.html.haml b/app/views/projects/merge_requests/show/_mr_accept.html.haml index 4b1857ccb68..bd7c8435f4c 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -4,7 +4,10 @@ %strong Archived projects cannot be committed to! - else .bs-callout - %strong You don't have permission to merge this MR + .automerge_widget.cannot_be_merged.hide + %strong This can't be merged automatically, even if it could be merged you don't have the permission to do so. + .automerge_widget.can_be_merged.hide + %strong This can be merged automatically but you don't have the permission to do so. - if @show_merge_controls |