diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 18:25:27 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-20 18:25:27 +0000 |
| commit | 56495fd12a5b413bea9ba07c18cdf284cb4d5115 (patch) | |
| tree | a5c0fb815e962fbbd1cf6877227148d024ab902c /app/views | |
| parent | ae6b44cf31df08667048706635745f5f4e17a60d (diff) | |
| parent | 493784da435179f98827f25cc89653686794996b (diff) | |
| download | gitlab-ce-56495fd12a5b413bea9ba07c18cdf284cb4d5115.tar.gz | |
Merge branch 'fix_infinite_scroll_breaks_on_back_button_activity_feed' into 'master'
fix bug causing the infinite scrolling in activity feeds to break when you click a link and navigate back
See merge request !3835
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_activity.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 961b61d2e76..48b0dd6b121 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -9,4 +9,7 @@ = spinner :javascript - new Activities(); + var activity = new Activities(); + $(document).on('page:restore', function (event) { + activity.reloadActivities() + }) |