Commit 0b432493 authored by Henry Smith's avatar Henry Smith

A couple of small wording improvements for the merge request approval page

parent f3ee1b42
- unless @allowed_to_merge - unless @allowed_to_merge
.alert .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 - if @show_merge_controls
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.automerge_widget.no_satellite{style: "display:none"} .automerge_widget.no_satellite{style: "display:none"}
.alert.alert-error .alert.alert-error
%span %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"} .automerge_widget.cannot_be_merged{style: "display:none"}
.alert.alert-disabled .alert.alert-disabled
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment