Commit 0b4324938a1b81554032b9583397c4b7c53fb3ec
1 parent
f3ee1b42
Exists in
master
and in
4 other branches
A couple of small wording improvements for the merge request approval page
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/views/projects/merge_requests/show/_mr_accept.html.haml
| 1 | - unless @allowed_to_merge | 1 | - unless @allowed_to_merge |
| 2 | .alert | 2 | .alert |
| 3 | - %strong You don't have enough permissions to merge this MR | 3 | + %strong You don't have permission to merge this MR |
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | - if @show_merge_controls | 6 | - if @show_merge_controls |
| @@ -27,7 +27,7 @@ | @@ -27,7 +27,7 @@ | ||
| 27 | .automerge_widget.no_satellite{style: "display:none"} | 27 | .automerge_widget.no_satellite{style: "display:none"} |
| 28 | .alert.alert-error | 28 | .alert.alert-error |
| 29 | %span | 29 | %span |
| 30 | - %strong This repository does not have satellite. Ask administrator to fix this issue | 30 | + %strong This repository does not have satellite. Ask an administrator to fix this issue |
| 31 | 31 | ||
| 32 | .automerge_widget.cannot_be_merged{style: "display:none"} | 32 | .automerge_widget.cannot_be_merged{style: "display:none"} |
| 33 | .alert.alert-disabled | 33 | .alert.alert-disabled |