diff options
| author | Phil Hughes <me@iamphill.com> | 2016-02-23 09:06:26 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-02-23 09:06:26 +0000 |
| commit | d80205b75502ad53b4db085b0fd7fc2a1cb54b05 (patch) | |
| tree | 62f221b3f8045bca3736352f323a7b8081d6eea5 /app/views | |
| parent | 7c8099853621cc2a244bf6e0fd37a8b503d1ec5e (diff) | |
| download | gitlab-ce-files-view-row-click.tar.gz | |
Fixes issue with file view rows not clickable on project main viewfiles-view-row-click
Fixed an issue where it would only load the first 25 commit data on project main view
Stopped the file view sending 1 too many requests
Fixes #3916
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/refs/logs_tree.js.haml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/views/projects/refs/logs_tree.js.haml b/app/views/projects/refs/logs_tree.js.haml index db7f244d002..8ee2aef0e61 100644 --- a/app/views/projects/refs/logs_tree.js.haml +++ b/app/views/projects/refs/logs_tree.js.haml @@ -8,12 +8,9 @@ row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}'); row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}'); -- if @logs.present? +- if @more_log_url :plain - var current_url = location.href.replace(/\/?$/, '/'); - var log_url = "#{escape_javascript(@log_url)}".replace(/\/?$/, '/'); - - if(current_url == log_url) { + if($('#tree-slider').length) { // Load more commit logs for each file in tree // if we still on the same page var url = "#{escape_javascript(@more_log_url)}"; |