diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-07-31 17:24:13 +0100 |
| commit | 0ac012f0ad14e8a77eedb026a2de12bf59fa5881 (patch) | |
| tree | ac4693a27c1ad2c5d37b5884f4ac316f4d56b0f7 /app/assets/javascripts/dispatcher.js | |
| parent | 933cfe1e0c493964052b664c2426a90f845f0042 (diff) | |
| parent | 2519027442a5645cc9467e842172143e3f56c7c3 (diff) | |
| download | gitlab-ce-0ac012f0ad14e8a77eedb026a2de12bf59fa5881.tar.gz | |
Merge remote-tracking branch 'origin/master' into ide
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js index 799b9643212..38b41cf2a19 100644 --- a/app/assets/javascripts/dispatcher.js +++ b/app/assets/javascripts/dispatcher.js @@ -8,6 +8,7 @@ /* global LabelsSelect */ /* global MilestoneSelect */ /* global Commit */ +/* global NewBranchForm */ /* global NotificationsForm */ /* global NotificationsDropdown */ /* global GroupAvatar */ @@ -263,7 +264,7 @@ import FeatureHelper from './helpers/feature_helper'; case 'projects:tags:new': new ZenMode(); new gl.GLForm($('.tag-form'), true); - new RefSelectDropdown($('.js-branch-select'), window.gl.availableRefs); + new RefSelectDropdown($('.js-branch-select')); break; case 'projects:snippets:show': initNotes(); @@ -334,6 +335,9 @@ import FeatureHelper from './helpers/feature_helper'; case 'projects:edit': setupProjectEdit(); break; + case 'projects:pipelines:new': + new NewBranchForm($('.js-new-pipeline-form')); + break; case 'projects:pipelines:builds': case 'projects:pipelines:failures': case 'projects:pipelines:show': @@ -390,6 +394,9 @@ import FeatureHelper from './helpers/feature_helper'; new TreeView(); new BlobViewer(); + $('#tree-slider').waitForImages(function() { + gl.utils.ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath); + }); break; case 'projects:find_file:show': shortcut_handler = true; @@ -548,6 +555,7 @@ import FeatureHelper from './helpers/feature_helper'; shortcut_handler = new ShortcutsWiki(); new ZenMode(); new gl.GLForm($('.wiki-form'), true); + new Sidebar(); break; case 'snippets': shortcut_handler = new ShortcutsNavigation(); |