diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-15 16:20:00 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-11-15 16:20:00 +0200 |
| commit | c938833bd9f5373af5b8012df39a360517fd5261 (patch) | |
| tree | 03c8266be26374f375faa00883c6659b40db0a63 | |
| parent | 875728b1184d4524bf96a6de47b329eba7645446 (diff) | |
| parent | adb58e36baedbfe7daf3b89942ad68adf9587f36 (diff) | |
| download | gitlab-ce-c938833bd9f5373af5b8012df39a360517fd5261.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | app/views/projects/merge_requests/show/_mr_box.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/merge_requests/show/_mr_box.html.haml b/app/views/projects/merge_requests/show/_mr_box.html.haml index e1d0c7c11ec..b1c73b439cc 100644 --- a/app/views/projects/merge_requests/show/_mr_box.html.haml +++ b/app/views/projects/merge_requests/show/_mr_box.html.haml @@ -13,13 +13,14 @@ .ui-box-body %div %cite.cgray - Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)} + Created on #{@merge_request.created_at.stamp("Aug 21, 2011")} by #{link_to_member(@project, @merge_request.author)}. - if @merge_request.assignee - \, currently assigned to #{link_to_member(@project, @merge_request.assignee)} + Currently assigned to #{link_to_member(@project, @merge_request.assignee)}. - if @merge_request.milestone - milestone = @merge_request.milestone - %cite.cgray and attached to milestone + %cite.cgray Attached to milestone %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) + \. - if @merge_request.description.present? |