Commit 03a1c994 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'kassio/bulkimports-enable-ff-by-default' into 'master'

Enable bulk_import feature flag by default

See merge request gitlab-org/gitlab!69110
parents 4c5fbb42 705657e3
...@@ -112,7 +112,7 @@ class Import::BulkImportsController < ApplicationController ...@@ -112,7 +112,7 @@ class Import::BulkImportsController < ApplicationController
end end
def ensure_group_import_enabled def ensure_group_import_enabled
render_404 unless Feature.enabled?(:bulk_import) render_404 unless Feature.enabled?(:bulk_import, default_enabled: :yaml)
end end
def access_token_key def access_token_key
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#import-group-pane.tab-pane #import-group-pane.tab-pane
- if import_sources_enabled? - if import_sources_enabled?
- if Feature.enabled?(:bulk_import) - if Feature.enabled?(:bulk_import, default_enabled: :yaml)
= render 'import_group_from_another_instance_panel' = render 'import_group_from_another_instance_panel'
.gl-mt-7.gl-border-b-solid.gl-border-gray-100.gl-border-1 .gl-mt-7.gl-border-b-solid.gl-border-gray-100.gl-border-1
= render 'import_group_from_file_panel' = render 'import_group_from_file_panel'
......
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255310 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/255310
milestone: '13.5' milestone: '13.5'
type: development type: development
group: group::import group: group::import
default_enabled: false default_enabled: true
...@@ -77,7 +77,7 @@ Any other items are **not** migrated. ...@@ -77,7 +77,7 @@ Any other items are **not** migrated.
## Enable or disable GitLab Group Migration ## Enable or disable GitLab Group Migration
GitLab Migration is deployed behind a feature flag that is **disabled by default**. GitLab Migration is deployed behind a feature flag that is **enabled by default**.
[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md) can enable it. [GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md) can enable it.
To enable it: To enable it:
......
...@@ -54,7 +54,6 @@ module QA ...@@ -54,7 +54,6 @@ module QA
end end
before do before do
Runtime::Feature.enable(:bulk_import) unless staging?
Runtime::Feature.enable(:top_level_group_creation_enabled) if staging? Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
...@@ -91,7 +90,6 @@ module QA ...@@ -91,7 +90,6 @@ module QA
after do after do
user.remove_via_api! user.remove_via_api!
ensure ensure
Runtime::Feature.disable(:bulk_import) unless staging?
Runtime::Feature.disable(:top_level_group_creation_enabled) if staging? Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
end end
end end
......
...@@ -38,7 +38,6 @@ module QA ...@@ -38,7 +38,6 @@ module QA
end end
before do before do
Runtime::Feature.enable(:bulk_import) unless staging?
Runtime::Feature.enable(:top_level_group_creation_enabled) if staging? Runtime::Feature.enable(:top_level_group_creation_enabled) if staging?
sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
...@@ -77,7 +76,6 @@ module QA ...@@ -77,7 +76,6 @@ module QA
after do after do
user.remove_via_api! user.remove_via_api!
ensure ensure
Runtime::Feature.disable(:bulk_import) unless staging?
Runtime::Feature.disable(:top_level_group_creation_enabled) if staging? Runtime::Feature.disable(:top_level_group_creation_enabled) if staging?
end end
end end
......
...@@ -56,8 +56,6 @@ module QA ...@@ -56,8 +56,6 @@ module QA
end end
before do before do
Runtime::Feature.enable(:bulk_import)
sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER) sandbox.add_member(user, Resource::Members::AccessLevel::MAINTAINER)
source_group.add_member(author, Resource::Members::AccessLevel::MAINTAINER) source_group.add_member(author, Resource::Members::AccessLevel::MAINTAINER)
author.set_public_email author.set_public_email
...@@ -83,8 +81,6 @@ module QA ...@@ -83,8 +81,6 @@ module QA
after do after do
user.remove_via_api! user.remove_via_api!
author.remove_via_api! author.remove_via_api!
ensure
Runtime::Feature.disable(:bulk_import)
end end
it 'imports group epics', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1921' do it 'imports group epics', testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1921' do
......
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