summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/show
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-20 10:03:29 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-12-20 10:03:29 +0200
commita84967630097f198601805695845da4f5138ef46 (patch)
treea3caa3062b29419505ad2efa1f45c0882dcd2f8a /app/views/projects/merge_requests/show
parente64c3b2b5c1907034a07aa69c0e732afc40170a5 (diff)
downloadgitlab-ce-a84967630097f198601805695845da4f5138ef46.tar.gz
Use relative dates with tooltips fopr Issue#show and MR#show
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/merge_requests/show')
-rw-r--r--app/views/projects/merge_requests/show/_mr_title.html.haml3
1 files changed, 1 insertions, 2 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 0d6a546bd54..b649a189c93 100644
--- a/app/views/projects/merge_requests/show/_mr_title.html.haml
+++ b/app/views/projects/merge_requests/show/_mr_title.html.haml
@@ -1,8 +1,7 @@
%h3.page-title
= "Merge Request ##{@merge_request.iid}"
%small
- created at
- = @merge_request.created_at.stamp("Aug 21, 2011")
+ created #{time_ago_with_tooltip(@merge_request.created_at)} ago
- if @merge_request.merged?
%span.state-label.state-label-green