diff options
| author | Phil Hughes <me@iamphill.com> | 2016-02-23 13:41:03 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-02-23 13:41:03 +0000 |
| commit | 01b965f6daf22eaeb511d35d3312c217cb1f2d33 (patch) | |
| tree | 98e3a611d77c86821ec00a5451c7b83eabd8e362 | |
| parent | d80205b75502ad53b4db085b0fd7fc2a1cb54b05 (diff) | |
| download | gitlab-ce-01b965f6daf22eaeb511d35d3312c217cb1f2d33.tar.gz | |
Correctly checks if tree view is on screen
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 | ||||
| -rw-r--r-- | app/controllers/projects/refs_controller.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index 7eda9a18a51..4c6cf3417e8 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -77,7 +77,7 @@ class Dispatcher when 'projects:show' shortcut_handler = new ShortcutsNavigation() - new TreeView() if $('#tree-slider') + new TreeView() if $('#tree-slider').length when 'groups:show' new Activities() shortcut_handler = new ShortcutsNavigation() diff --git a/app/controllers/projects/refs_controller.rb b/app/controllers/projects/refs_controller.rb index 8aeff064732..00df1c9c965 100644 --- a/app/controllers/projects/refs_controller.rb +++ b/app/controllers/projects/refs_controller.rb @@ -64,7 +64,7 @@ class Projects::RefsController < Projects::ApplicationController } end - offset = (@offset + @limit) + offset = (@offset + @limit) if contents.size > offset @more_log_url = logs_file_namespace_project_ref_path(@project.namespace, @project, @ref, @path || '', offset: offset) end |