diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-15 14:42:51 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-15 14:42:51 +0000 |
| commit | 6cc81e5f82317e083cd1ca0c049dc6efbf5186e8 (patch) | |
| tree | f8c6989dc323f3ba740d602d8b5a26f92072fc9e | |
| parent | 159cd36c108d7844d3ba496ff013acbb57feedb6 (diff) | |
| parent | 5b0d813c09a4a64d90fe3ac3a54815f43cccdcc6 (diff) | |
| download | gitlab-ce-6cc81e5f82317e083cd1ca0c049dc6efbf5186e8.tar.gz | |
Merge branch 'update_stable' into '7-13-stable'
Time ago fix for compare page
See merge request !1905
| -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() |