diff options
| author | Mike Greiling <mgreiling@gitlab.com> | 2017-08-10 03:14:21 +0000 |
|---|---|---|
| committer | Mike Greiling <mgreiling@gitlab.com> | 2017-08-10 03:14:21 +0000 |
| commit | 7e5ac7114ca5540c5a9b6b6cd0f832c5f71794d2 (patch) | |
| tree | 57b572f23b16f4b00159af1759d9d59cb14c1e5b /app/assets/javascripts/dispatcher.js | |
| parent | 3d08e47239ffd00856507b73f1ce36ffa1e05256 (diff) | |
| parent | 2925850ceec3ef89eb1f60b0a648dbc5f72d8683 (diff) | |
| download | gitlab-ce-7e5ac7114ca5540c5a9b6b6cd0f832c5f71794d2.tar.gz | |
Merge branch 'master' into '36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view'36133-project-overview-page-doesn-t-load-commit-metadata-for-repo-view
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 745c3e892f3..482825f5947 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -343,6 +343,7 @@ import UserFeatureHelper from './helpers/user_feature_helper'; if ($('#tree-slider').length) new TreeView(); if ($('.blob-viewer').length) new BlobViewer(); + if ($('.project-show-activity').length) new gl.Activities(); $('#tree-slider').waitForImages(function() { gl.utils.ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath); }); |