Commit 5e5f3df6 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'projects-a-refactor-ee' into 'master'

EE branch for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16300

See merge request gitlab-org/gitlab-ee!3963
parents b84ab70a 548993f7
...@@ -12,7 +12,6 @@ import notificationsDropdown from './notifications_dropdown'; ...@@ -12,7 +12,6 @@ import notificationsDropdown from './notifications_dropdown';
import groupAvatar from './group_avatar'; import groupAvatar from './group_avatar';
import GroupLabelSubscription from './group_label_subscription'; import GroupLabelSubscription from './group_label_subscription';
import LineHighlighter from './line_highlighter'; import LineHighlighter from './line_highlighter';
import BuildArtifacts from './build_artifacts';
import groupsSelect from './groups_select'; import groupsSelect from './groups_select';
import Search from './search'; import Search from './search';
import initAdmin from './admin'; import initAdmin from './admin';
...@@ -405,8 +404,10 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line ...@@ -405,8 +404,10 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
$('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath); $('.commit-info.branches').load(document.querySelector('.js-commit-box').dataset.commitPath);
break; break;
case 'projects:activity': case 'projects:activity':
new Activities(); import('./pages/projects/activity')
shortcut_handler = new ShortcutsNavigation(); .then(callDefault)
.catch(fail);
shortcut_handler = true;
break; break;
case 'projects:commits:show': case 'projects:commits:show':
CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit); CommitsList.init(document.querySelector('.js-project-commits-show').dataset.commitsLimit);
...@@ -569,12 +570,16 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line ...@@ -569,12 +570,16 @@ import initLDAPGroupsSelect from 'ee/ldap_groups_select'; // eslint-disable-line
.catch(() => {}); .catch(() => {});
break; break;
case 'projects:artifacts:browse': case 'projects:artifacts:browse':
new ShortcutsNavigation(); import('./pages/projects/artifacts/browse')
new BuildArtifacts(); .then(callDefault)
.catch(fail);
shortcut_handler = true;
break; break;
case 'projects:artifacts:file': case 'projects:artifacts:file':
new ShortcutsNavigation(); import('./pages/projects/artifacts/file')
new BlobViewer(); .then(callDefault)
.catch(fail);
shortcut_handler = true;
break; break;
case 'help:index': case 'help:index':
VersionCheckImage.bindErrorEvent($('img.js-version-status-badge')); VersionCheckImage.bindErrorEvent($('img.js-version-status-badge'));
......
import Activities from '~/activities';
import ShortcutsNavigation from '~/shortcuts_navigation';
export default function () {
new Activities(); // eslint-disable-line no-new
new ShortcutsNavigation(); // eslint-disable-line no-new
}
import BuildArtifacts from '~/build_artifacts';
import ShortcutsNavigation from '~/shortcuts_navigation';
export default function () {
new ShortcutsNavigation(); // eslint-disable-line no-new
new BuildArtifacts(); // eslint-disable-line no-new
}
import BlobViewer from '~/blob/viewer/index';
import ShortcutsNavigation from '~/shortcuts_navigation';
export default function () {
new ShortcutsNavigation(); // eslint-disable-line no-new
new BlobViewer(); // eslint-disable-line no-new
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment