summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-07-15 16:59:31 +0300
committerValery Sizov <vsv2711@gmail.com>2015-07-15 17:40:59 +0300
commit5b0d813c09a4a64d90fe3ac3a54815f43cccdcc6 (patch)
treef8c6989dc323f3ba740d602d8b5a26f92072fc9e
parent159cd36c108d7844d3ba496ff013acbb57feedb6 (diff)
downloadgitlab-ce-5b0d813c09a4a64d90fe3ac3a54815f43cccdcc6.tar.gz
Time ago fix for compare page
-rw-r--r--app/views/projects/merge_requests/branch_from.js.haml1
-rw-r--r--app/views/projects/merge_requests/branch_to.js.haml1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/branch_from.js.haml b/app/views/projects/merge_requests/branch_from.js.haml
index 8372afa61b5..9210798f39c 100644
--- a/app/views/projects/merge_requests/branch_from.js.haml
+++ b/app/views/projects/merge_requests/branch_from.js.haml
@@ -1,2 +1,3 @@
:plain
$(".mr_source_commit").html("#{commit_to_html(@commit, @source_project, false)}");
+ $('.js-timeago').timeago()
diff --git a/app/views/projects/merge_requests/branch_to.js.haml b/app/views/projects/merge_requests/branch_to.js.haml
index f7ede0ded53..32fe2d535f3 100644
--- a/app/views/projects/merge_requests/branch_to.js.haml
+++ b/app/views/projects/merge_requests/branch_to.js.haml
@@ -1,2 +1,3 @@
:plain
$(".mr_target_commit").html("#{commit_to_html(@commit, @target_project, false)}");
+ $('.js-timeago').timeago()