From 0b4324938a1b81554032b9583397c4b7c53fb3ec Mon Sep 17 00:00:00 2001 From: Henry Smith Date: Thu, 15 Aug 2013 19:01:05 +0100 Subject: [PATCH] A couple of small wording improvements for the merge request approval page --- app/views/projects/merge_requests/show/_mr_accept.html.haml | 4 ++-- 1 file 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 7cae196..299e1bc 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 -- libgit2 0.21.2