Commit e4606cc5 authored by Phil Hughes's avatar Phil Hughes

Merge branch '23315-feature-flag-and-import-fix' into 'master'

Fix feature flag check on container registry explorer

Closes #23315

See merge request gitlab-org/gitlab!25511
parents b73968c1 8e7bd802
...@@ -3,7 +3,11 @@ import registryExplorer from '~/registry/explorer/index'; ...@@ -3,7 +3,11 @@ import registryExplorer from '~/registry/explorer/index';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
initRegistryImages(); initRegistryImages();
const { attachMainComponent, attachBreadcrumb } = registryExplorer();
attachBreadcrumb(); const explorer = registryExplorer();
attachMainComponent();
if (explorer) {
explorer.attachBreadcrumb();
explorer.attachMainComponent();
}
}); });
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%section %section
.row.registry-placeholder.prepend-bottom-10 .row.registry-placeholder.prepend-bottom-10
.col-12 .col-12
- if Feature.enabled?(:vue_container_registry_explorer) - if Feature.enabled?(:vue_container_registry_explorer, @group)
#js-container-registry{ data: { endpoint: group_container_registries_path(@group), #js-container-registry{ data: { endpoint: group_container_registries_path(@group),
"help_page_path" => help_page_path('user/packages/container_registry/index'), "help_page_path" => help_page_path('user/packages/container_registry/index'),
"two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'), "two_factor_auth_help_link" => help_page_path('user/profile/account/two_factor_authentication'),
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%section %section
.row.registry-placeholder.prepend-bottom-10 .row.registry-placeholder.prepend-bottom-10
.col-12 .col-12
- if Feature.enabled?(:vue_container_registry_explorer) - if Feature.enabled?(:vue_container_registry_explorer, @project)
#js-container-registry{ data: { endpoint: project_container_registry_index_path(@project), #js-container-registry{ data: { endpoint: project_container_registry_index_path(@project),
project_path: @project.full_path, project_path: @project.full_path,
"help_page_path" => help_page_path('user/packages/container_registry/index'), "help_page_path" => help_page_path('user/packages/container_registry/index'),
......
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