diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-27 19:48:05 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-03-27 19:48:05 +0200 |
| commit | c66218ec94e51386d1f84306b36687dd0856d970 (patch) | |
| tree | 2001d6cf39dacd0df06c3c6c162837facf5c9baf | |
| parent | 0c5c1157af07b344350700da97d530184ef055f1 (diff) | |
| parent | 592dce18b549cd29933603f53f1ab8fb9f33840e (diff) | |
| download | gitlab-ce-c66218ec94e51386d1f84306b36687dd0856d970.tar.gz | |
Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission
Always show merge 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 |