diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 00:24:02 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 00:24:02 +0000 |
| commit | ec2e54b36347e9817e7b0caa0c095a100e1e8c93 (patch) | |
| tree | 74d54578c00e1bcfdf8ae1dd401289d4aaf4b1bf | |
| parent | b50756401746d936cfe3eea5e0c6d300ab0db0eb (diff) | |
| parent | 56b323914e7bfbe2a9e09994422977af404d1e51 (diff) | |
| download | gitlab-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
4 files changed, 6 insertions, 13 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(); -}); diff --git a/app/views/projects/protected_tags/_index.html.haml b/app/views/projects/protected_tags/_index.html.haml index 74f7f63c941..6b284fda35c 100644 --- a/app/views/projects/protected_tags/_index.html.haml +++ b/app/views/projects/protected_tags/_index.html.haml @@ -1,6 +1,3 @@ -- content_for :page_specific_javascripts do - = webpack_bundle_tag('protected_tags') - - content_for :create_protected_tag do = render 'projects/protected_tags/create_protected_tag' diff --git a/config/webpack.config.js b/config/webpack.config.js index 56d83e0ba1d..e806083bf16 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -49,7 +49,6 @@ function generateEntries() { notebook_viewer: './blob/notebook_viewer.js', pdf_viewer: './blob/pdf_viewer.js', protected_branches: './protected_branches', - protected_tags: './protected_tags', registry_list: './registry/index.js', sketch_viewer: './blob/sketch_viewer.js', stl_viewer: './blob/stl_viewer.js', |