summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-02-19 18:21:42 +0000
committerRémy Coutable <remy@rymai.me>2016-02-19 19:32:55 +0100
commit441896589efd9d2730e7c0598ea23eef6eab8aad (patch)
tree25c7c4afd86fde4cd4b7a8ff0d76c78a5d7e62fa
parent62067b74c826ed3ac527b8e139e5d4f8976cd710 (diff)
downloadgitlab-ce-441896589efd9d2730e7c0598ea23eef6eab8aad.tar.gz
Merge branch 'bugfix/jschatz1/issuable-consistency' into 'master'
Consistency in MR and issue header. Fixes: #13550 ![Screen_Shot_2016-02-18_at_11.20.19_AM](/uploads/8327ff045e45029b85b2cbac72c98a7f/Screen_Shot_2016-02-18_at_11.20.19_AM.png)![Screen_Shot_2016-02-18_at_11.20.55_AM](/uploads/f79613ebb23e4a62fb1bdb48d6f7fd2b/Screen_Shot_2016-02-18_at_11.20.55_AM.png) See merge request !2874
-rw-r--r--app/views/projects/merge_requests/show/_mr_title.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_title.html.haml b/app/views/projects/merge_requests/show/_mr_title.html.haml
index 473fbff721b..14ea7b17786 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -5,7 +5,7 @@
Merge Request ##{@merge_request.iid}
%span.creator
&middot;
- opened by #{link_to_member(@project, @merge_request.author, size: 24)}
+ by #{link_to_member(@project, @merge_request.author, size: 24)}
&middot;
= time_ago_with_tooltip(@merge_request.created_at)