summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-18 22:47:14 +0000
committerAlejandro Rodríguez <alejorro70@gmail.com>2016-11-19 16:55:01 +0000
commit23b02b77aa2781c9efd8cc9e8902783384a783c1 (patch)
tree048cbd9fc255a1d287ccecd113c176ec91072a14
parent246feb6ab715936fe4e7134023b761a2cdbe7674 (diff)
downloadgitlab-ce-23b02b77aa2781c9efd8cc9e8902783384a783c1.tar.gz
Merge branch '24652-fix-timeago-not-rendering-in-repository-view' into 'master'
Fix broken commit metadata loading for large repository trees ## What does this MR do? Fixes a regression introduced in !7208 in which a call to `ajaxGet()` would fail when loading metadata for large repository trees. This call produced no errors in the console because it is contained in a sort of `eval` block in jQuery. This is an ugly, easily broken method for loading data asynchronously whose problems were exemplified by this issue. I'm opening a separate issue (#24660) to alter this implementation. ## Why was this MR needed? The failing AJAX call was causing metadata to stop loading, and the `timeago` functionality to stop running due to script failure. ## Screenshots (if relevant) ![Screen_Shot_2016-11-18_at_2.03.13_PM_copy](/uploads/ab0c11d5c405c01d8e45818b3ca96f23/Screen_Shot_2016-11-18_at_2.03.13_PM_copy.png) ## Does this MR meet the acceptance criteria? - [ ] All builds are passing - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) ## What are the relevant issue numbers? Closes #24652 See merge request !7588
-rw-r--r--app/views/projects/refs/logs_tree.js.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/refs/logs_tree.js.haml b/app/views/projects/refs/logs_tree.js.haml
index 44fa4b60343..d07bb661615 100644
--- a/app/views/projects/refs/logs_tree.js.haml
+++ b/app/views/projects/refs/logs_tree.js.haml
@@ -14,8 +14,8 @@
// Load more commit logs for each file in tree
// if we still on the same page
var url = "#{escape_javascript(@more_log_url)}";
- ajaxGet(url);
+ gl.utils.ajaxGet(url);
}
:plain
- gl.utils.localTimeAgo($('.js-timeago', 'table.table_#{@hex_path} tbody')); \ No newline at end of file
+ gl.utils.localTimeAgo($('.js-timeago', 'table.table_#{@hex_path} tbody'));