diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2018-03-01 23:44:10 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-03-01 23:44:10 +0000 |
| commit | 947a7f858765fdbad2f4084bed24994329d62337 (patch) | |
| tree | 457190350d892f048a5565aca337de5da350b20d | |
| parent | 257af80e45a833274e55bc25e5d19264435c99c4 (diff) | |
| parent | 9f23532c8bcd984b7d20ad8a23ff9d691c60afdf (diff) | |
| download | gitlab-ce-947a7f858765fdbad2f4084bed24994329d62337.tar.gz | |
Merge branch 'webpack-registry' into 'master'
Remove registry list webpack entry point
See merge request gitlab-org/gitlab-ce!17459
| -rw-r--r-- | app/assets/javascripts/pages/projects/registry/repositories/index.js | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/registry/index.js | 4 | ||||
| -rw-r--r-- | app/views/projects/registry/repositories/index.html.haml | 1 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/projects/registry/repositories/index.js b/app/assets/javascripts/pages/projects/registry/repositories/index.js new file mode 100644 index 00000000000..35564754ee0 --- /dev/null +++ b/app/assets/javascripts/pages/projects/registry/repositories/index.js @@ -0,0 +1,3 @@ +import initRegistryImages from '~/registry/index'; + +document.addEventListener('DOMContentLoaded', initRegistryImages); diff --git a/app/assets/javascripts/registry/index.js b/app/assets/javascripts/registry/index.js index d8edff73f72..6fb125192b2 100644 --- a/app/assets/javascripts/registry/index.js +++ b/app/assets/javascripts/registry/index.js @@ -4,7 +4,7 @@ import Translate from '../vue_shared/translate'; Vue.use(Translate); -document.addEventListener('DOMContentLoaded', () => new Vue({ +export default () => new Vue({ el: '#js-vue-registry-images', components: { registryApp, @@ -22,4 +22,4 @@ document.addEventListener('DOMContentLoaded', () => new Vue({ }, }); }, -})); +}); diff --git a/app/views/projects/registry/repositories/index.html.haml b/app/views/projects/registry/repositories/index.html.haml index 744b88760bc..27e1f9fba3e 100644 --- a/app/views/projects/registry/repositories/index.html.haml +++ b/app/views/projects/registry/repositories/index.html.haml @@ -15,7 +15,6 @@ #js-vue-registry-images{ data: { endpoint: project_container_registry_index_path(@project, format: :json) } } = webpack_bundle_tag('common_vue') - = webpack_bundle_tag('registry_list') .row.prepend-top-10 .col-lg-12 diff --git a/config/webpack.config.js b/config/webpack.config.js index fd0bfb59e65..6d672ff00ba 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -46,7 +46,6 @@ function generateEntries() { monitoring: './monitoring/monitoring_bundle.js', mr_notes: './mr_notes/index.js', protected_branches: './protected_branches', - registry_list: './registry/index.js', terminal: './terminal/terminal_bundle.js', two_factor_auth: './two_factor_auth.js', |