Commit aacb95dd authored by Jacob Schatz's avatar Jacob Schatz

Merge branch 'webpack-mirrors' into 'master'

Remove mirror webpack bundle entry

See merge request gitlab-org/gitlab-ee!4796
parents 998935a5 a59c1230
...@@ -63,7 +63,6 @@ function generateEntries() { ...@@ -63,7 +63,6 @@ function generateEntries() {
// EE-only // EE-only
geo_nodes: 'ee/geo_nodes', geo_nodes: 'ee/geo_nodes',
mirrors: 'ee/mirrors',
service_desk: 'ee/projects/settings_service_desk/service_desk_bundle.js', service_desk: 'ee/projects/settings_service_desk/service_desk_bundle.js',
}; };
......
import MirrorPull from './mirror_pull';
document.addEventListener('DOMContentLoaded', () => {
const mirrorPull = new MirrorPull('.js-project-mirror-push-form');
mirrorPull.init();
});
...@@ -7,6 +7,7 @@ import CEProtectedBranchCreate from '~/protected_branches/protected_branch_creat ...@@ -7,6 +7,7 @@ import CEProtectedBranchCreate from '~/protected_branches/protected_branch_creat
import CEProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list'; import CEProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list';
import CEProtectedTagCreate from '~/protected_tags/protected_tag_create'; import CEProtectedTagCreate from '~/protected_tags/protected_tag_create';
import CEProtectedTagEditList from '~/protected_tags/protected_tag_edit_list'; import CEProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
import MirrorPull from 'ee/mirrors/mirror_pull';
import ProtectedBranchCreate from 'ee/protected_branches/protected_branch_create'; import ProtectedBranchCreate from 'ee/protected_branches/protected_branch_create';
import ProtectedBranchEditList from 'ee/protected_branches/protected_branch_edit_list'; import ProtectedBranchEditList from 'ee/protected_branches/protected_branch_edit_list';
...@@ -33,4 +34,10 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -33,4 +34,10 @@ document.addEventListener('DOMContentLoaded', () => {
new CEProtectedTagCreate(); new CEProtectedTagCreate();
new CEProtectedTagEditList(); new CEProtectedTagEditList();
} }
const mirrorPull = new MirrorPull('.js-project-mirror-push-form');
if (mirrorPull) {
mirrorPull.init();
}
}); });
- content_for :page_specific_javascripts do
= webpack_bundle_tag 'mirrors'
- if can?(current_user, :admin_mirror, @project) - if can?(current_user, :admin_mirror, @project)
= render 'projects/mirrors/pull' = render 'projects/mirrors/pull'
= render 'projects/mirrors/push' = render 'projects/mirrors/push'
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