summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorClement Ho <clemmakesapps@gmail.com>2018-03-01 00:24:02 +0000
committerClement Ho <clemmakesapps@gmail.com>2018-03-01 00:24:02 +0000
commitec2e54b36347e9817e7b0caa0c095a100e1e8c93 (patch)
tree74d54578c00e1bcfdf8ae1dd401289d4aaf4b1bf /app/assets
parentb50756401746d936cfe3eea5e0c6d300ab0db0eb (diff)
parent56b323914e7bfbe2a9e09994422977af404d1e51 (diff)
downloadgitlab-ce-ec2e54b36347e9817e7b0caa0c095a100e1e8c93.tar.gz
Merge branch 'protected-tags-bundle-refactor' into 'master'
Removed protected_tags webpack bundle See merge request gitlab-org/gitlab-ce!17334
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/pages/projects/settings/repository/show/index.js6
-rw-r--r--app/assets/javascripts/protected_tags/index.js9
2 files changed, 6 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/projects/settings/repository/show/index.js b/app/assets/javascripts/pages/projects/settings/repository/show/index.js
index 5a6f4138b10..001128ead59 100644
--- a/app/assets/javascripts/pages/projects/settings/repository/show/index.js
+++ b/app/assets/javascripts/pages/projects/settings/repository/show/index.js
@@ -1,7 +1,13 @@
+/* eslint-disable no-new */
+
+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';
document.addEventListener('DOMContentLoaded', () => {
+ new ProtectedTagCreate();
+ new ProtectedTagEditList();
initDeployKeys();
initSettingsPanels();
});
diff --git a/app/assets/javascripts/protected_tags/index.js b/app/assets/javascripts/protected_tags/index.js
deleted file mode 100644
index b1618e24e49..00000000000
--- a/app/assets/javascripts/protected_tags/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/* eslint-disable no-unused-vars */
-
-import ProtectedTagCreate from './protected_tag_create';
-import ProtectedTagEditList from './protected_tag_edit_list';
-
-$(() => {
- const protectedtTagCreate = new ProtectedTagCreate();
- const protectedtTagEditList = new ProtectedTagEditList();
-});