Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-11-21 22:55:20 +0300
committerFatih Acet <acetfatih@gmail.com>2016-11-21 22:55:20 +0300
commit1a765357801421cffe413c3101d1fcca6da01600 (patch)
treeca503e41118e38476be4f18a3fe74e1d5bb3ef5c /app/views/projects
parent7a5e653fde62cfcd0e05be7954bbf14de0cb6d8c (diff)
parent0dd95ca98381b4c6fc7016dd50dd3052051491b0 (diff)
Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master'
Resolve "Activity entries are not loaded fully to cover full window's height" ## What does this MR do? Fixes a bug in which a browser window large enough to encompass the default number of items in an auto-loading endless-scroll list could not trigger the loading of additional items. ## Are there points in the code the reviewer needs to double check? I refactored activities.js and pager.js into es6 syntax while I was investigating the issue. No changes were made other than some es6 flourishes and eslint conformity, so nothing should be effected, but perhaps best to double check other pages which utilize these scripts. ## Screenshots (if relevant) ![endless-scroll-fixed](/uploads/b672b606826af745528c209ab6cfe95c/endless-scroll-fixed.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24499 See merge request !7608
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/_activity.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml
index d011e51e696..4f15f2997fb 100644
--- a/app/views/projects/_activity.html.haml
+++ b/app/views/projects/_activity.html.haml
@@ -13,7 +13,7 @@
= spinner
:javascript
- var activity = new Activities();
+ var activity = new gl.Activities();
$(document).on('page:restore', function (event) {
activity.reloadActivities()
})