diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-07-15 14:38:04 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-07-15 14:38:04 +0000 |
| commit | d9078749a5a2d78ed6b8253184a1aacdf9193cdc (patch) | |
| tree | af015cc9eeaebe6683561dbd079ac31d71230cee | |
| parent | 997a3b1d872f6b6b198582677acd67595bb15029 (diff) | |
| parent | d2479a25c761f2517f94048e6da888186317142b (diff) | |
| download | gitlab-ce-d9078749a5a2d78ed6b8253184a1aacdf9193cdc.tar.gz | |
Merge branch 'time_ago_fix' into 'master'
Time ago fix for branch compare page
https://dev.gitlab.org/gitlab/gitlabhq/issues/2508
See merge request !1904
| -rw-r--r-- | app/views/projects/merge_requests/branch_from.js.haml | 1 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/branch_to.js.haml | 1 |
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() |