summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2014-09-14 12:32:01 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2014-09-14 12:32:01 +0200
commit67cf376d97372a9c175f09a12a8ced9c0f5c036f (patch)
tree6368ce62dabc79539ba9cfa4cca1ea4ea6fcac8f
parentb3a88a0fdc062f11d2580e361296865acdba4973 (diff)
parenta391cd21d74140b8d5a253f64b66f5d313304f58 (diff)
downloadgitlab-ce-67cf376d97372a9c175f09a12a8ced9c0f5c036f.tar.gz
Merge pull request #7753 from tamers/patch-1
Fix grammatical error in 'not merged changes' msg
-rw-r--r--app/views/projects/merge_requests/show/_state_widget.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_state_widget.html.haml b/app/views/projects/merge_requests/show/_state_widget.html.haml
index c30310f1258..a5f8af89d1a 100644
--- a/app/views/projects/merge_requests/show/_state_widget.html.haml
+++ b/app/views/projects/merge_requests/show/_state_widget.html.haml
@@ -13,7 +13,7 @@
%h4
Closed by #{link_to_member(@project, @merge_request.closed_event.author, avatar: false)}
#{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
- %p Changes was not merged into target branch
+ %p Changes were not merged into target branch
- if @merge_request.merged?
%h4