Merge branch 'ee-refactor-protected-branches' into 'master'

Remove protected branches webpack bundle tag (EE)

See merge request gitlab-org/gitlab-ee!4734

app/assets/javascripts/pages/projects/settings/repository/show/index.js

@@ -4,10 +4,14 @@ import ProtectedTagCreate from '~/protected_tags/protected_tag_create';
 import ProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
 import initSettingsPanels from '~/settings_panels';
 import initDeployKeys from '~/deploy_keys';
+import ProtectedBranchCreate from '~/protected_branches/protected_branch_create';
+import ProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list';
 
 document.addEventListener('DOMContentLoaded', () => {
   new ProtectedTagCreate();
   new ProtectedTagEditList();
   initDeployKeys();
   initSettingsPanels();
+  new ProtectedBranchCreate(); // eslint-disable-line no-new
+  new ProtectedBranchEditList(); // eslint-disable-line no-new
 });

app/assets/javascripts/protected_branches/index.js

-/* eslint-disable no-unused-vars */
-
-import ProtectedBranchCreate from './protected_branch_create';
-import ProtectedBranchEditList from './protected_branch_edit_list';
-
-$(() => {
-  const protectedBranchCreate = new ProtectedBranchCreate();
-  const protectedBranchEditList = new ProtectedBranchEditList();
-});

app/views/projects/protected_branches/_index.html.haml

-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag('protected_branches')
-
 - content_for :create_protected_branch do
   = render 'projects/protected_branches/create_protected_branch'
 

config/webpack.config.js

@@ -50,7 +50,6 @@ function generateEntries() {
   const manualEntries = {
     monitoring:           './monitoring/monitoring_bundle.js',
     mr_notes:             './mr_notes/index.js',
-    protected_branches:   './protected_branches',
     terminal:             './terminal/terminal_bundle.js',
     two_factor_auth:      './two_factor_auth.js',
 
@@ -70,7 +69,6 @@ function generateEntries() {
     geo_nodes:            'ee/geo_nodes',
     ldap_group_links:     'ee/groups/ldap_group_links.js',
     mirrors:              'ee/mirrors',
-    ee_protected_branches: 'ee/protected_branches',
     service_desk:         'ee/projects/settings_service_desk/service_desk_bundle.js',
   };
 

ee/app/assets/javascripts/pages/projects/settings/repository/show/index.js

@@ -3,21 +3,34 @@ import UsersSelect from '~/users_select';
 import UserCallout from '~/user_callout';
 import initSettingsPanels from '~/settings_panels';
 import initDeployKeys from '~/deploy_keys';
-import ProtectedTagCreate from 'ee/protected_tags/protected_tag_create';
-import ProtectedTagEditList from 'ee/protected_tags/protected_tag_edit_list';
+import CEProtectedBranchCreate from '~/protected_branches/protected_branch_create';
+import CEProtectedBranchEditList from '~/protected_branches/protected_branch_edit_list';
 import CEProtectedTagCreate from '~/protected_tags/protected_tag_create';
 import CEProtectedTagEditList from '~/protected_tags/protected_tag_edit_list';
 
+import ProtectedBranchCreate from 'ee/protected_branches/protected_branch_create';
+import ProtectedBranchEditList from 'ee/protected_branches/protected_branch_edit_list';
+import ProtectedTagCreate from 'ee/protected_tags/protected_tag_create';
+import ProtectedTagEditList from 'ee/protected_tags/protected_tag_edit_list';
+
 document.addEventListener('DOMContentLoaded', () => {
   new UsersSelect();
   new UserCallout();
+
+  initDeployKeys();
+  initSettingsPanels();
+
   if (document.querySelector('.js-protected-refs-for-users')) {
+    new ProtectedBranchCreate();
+    new ProtectedBranchEditList();
+
     new ProtectedTagCreate();
     new ProtectedTagEditList();
   } else {
+    new CEProtectedBranchCreate();
+    new CEProtectedBranchEditList();
+
     new CEProtectedTagCreate();
     new CEProtectedTagEditList();
   }
-  initDeployKeys();
-  initSettingsPanels();
 });

ee/app/views/projects/protected_branches/ee/_index.html.haml

-- content_for :page_specific_javascripts do
-  = webpack_bundle_tag 'ee_protected_branches'
-
 - content_for :create_protected_branch do
   = render 'projects/protected_branches/ee/create_protected_branch'