diff options
| author | Henry Smith <henry@henrysmith.org> | 2013-08-15 19:01:05 +0100 |
|---|---|---|
| committer | Henry Smith <henry@henrysmith.org> | 2013-08-15 19:01:05 +0100 |
| commit | 0b4324938a1b81554032b9583397c4b7c53fb3ec (patch) | |
| tree | 6db61e96a01b721c8cc31c1b9e80fcf515851546 | |
| parent | f3ee1b42bd7897c3b8943f8e160df66d5086098b (diff) | |
| download | gitlab-ce-0b4324938a1b81554032b9583397c4b7c53fb3ec.tar.gz | |
A couple of small wording improvements for the merge request approval page
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_accept.html.haml | 4 |
1 files changed, 2 insertions, 2 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 7cae196d0a1..299e1bc1e08 100644 --- a/app/views/projects/merge_requests/show/_mr_accept.html.haml +++ b/app/views/projects/merge_requests/show/_mr_accept.html.haml @@ -1,6 +1,6 @@ - unless @allowed_to_merge .alert - %strong You don't have enough permissions to merge this MR + %strong You don't have permission to merge this MR - if @show_merge_controls @@ -27,7 +27,7 @@ .automerge_widget.no_satellite{style: "display:none"} .alert.alert-error %span - %strong This repository does not have satellite. Ask administrator to fix this issue + %strong This repository does not have satellite. Ask an administrator to fix this issue .automerge_widget.cannot_be_merged{style: "display:none"} .alert.alert-disabled |