diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-13 16:40:59 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-13 16:40:59 +0200 |
| commit | af25001d462c74bd9bc2470a278a2bafbdefb0b9 (patch) | |
| tree | 290a6e31a53d5106b14dd00042b3a5c3e0b23460 /app/assets/javascripts/merge_request_tabs.js.coffee | |
| parent | 667d44c25ccefb511fc0d206eaa5990117032236 (diff) | |
| parent | f026e53c4df5b0b3bb7435c05d3c8662afe45881 (diff) | |
| download | gitlab-ce-af25001d462c74bd9bc2470a278a2bafbdefb0b9.tar.gz | |
Merge branch 'master' into push-ref
Diffstat (limited to 'app/assets/javascripts/merge_request_tabs.js.coffee')
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js.coffee | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/merge_request_tabs.js.coffee b/app/assets/javascripts/merge_request_tabs.js.coffee index 9946249adbf..ef0b534a709 100644 --- a/app/assets/javascripts/merge_request_tabs.js.coffee +++ b/app/assets/javascripts/merge_request_tabs.js.coffee @@ -142,7 +142,7 @@ class @MergeRequestTabs url: "#{source}.json" success: (data) => document.querySelector("div#commits").innerHTML = data.html - $('.js-timeago').timeago() + gl.utils.localTimeAgo($('.js-timeago', 'div#commits')) @commitsLoaded = true @scrollToElement("#commits") @@ -153,7 +153,7 @@ class @MergeRequestTabs url: "#{source}.json" + @_location.search success: (data) => document.querySelector("div#diffs").innerHTML = data.html - $('.js-timeago').timeago() + gl.utils.localTimeAgo($('.js-timeago', 'div#diffs')) $('div#diffs .js-syntax-highlight').syntaxHighlight() @expandViewContainer() if @diffViewType() is 'parallel' @diffsLoaded = true @@ -166,7 +166,7 @@ class @MergeRequestTabs url: "#{source}.json" success: (data) => document.querySelector("div#builds").innerHTML = data.html - $('.js-timeago').timeago() + gl.utils.localTimeAgo($('.js-timeago', 'div#builds')) @buildsLoaded = true @scrollToElement("#builds") |