diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml index 75398f3aa2177edf02925f8ca7cde5a48ff9179d..19ce285162f5f8a01e27167a570b96ea6183a4a6 100644 --- a/app/views/admin/dev_ops_report/show.html.haml +++ b/app/views/admin/dev_ops_report/show.html.haml @@ -3,7 +3,7 @@ .container .gl-mt-3 - - if Gitlab.ee? && Feature.enabled?(:devops_adoption_feature, default_enabled: true) && License.feature_available?(:devops_adoption) + - if Gitlab.ee? && License.feature_available?(:devops_adoption) = render_if_exists 'admin/dev_ops_report/devops_tabs' - else = render 'report' diff --git a/config/feature_flags/development/devops_adoption_feature.yml b/config/feature_flags/development/devops_adoption_feature.yml deleted file mode 100644 index 34ade24cbc66c4f6752666c565aa2938869e011c..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/devops_adoption_feature.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: devops_adoption_feature -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46005 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/271568 -milestone: '13.6' -type: development -group: group::analytics -default_enabled: true diff --git a/doc/user/admin_area/analytics/dev_ops_report.md b/doc/user/admin_area/analytics/dev_ops_report.md index 8f629fd4250da10180bb932849bfcba832c65ff9..eb12dcbde9c5d5b2b82c8d9d96a6692b6abf9f45 100644 --- a/doc/user/admin_area/analytics/dev_ops_report.md +++ b/doc/user/admin_area/analytics/dev_ops_report.md @@ -59,21 +59,3 @@ DevOps Adoption allows you to: - Find the groups that have adopted certain features and can provide guidance to other groups on how to use those features.  - -### Disable or enable DevOps Adoption - -DevOps Adoption 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 opt to disable it. - -To disable it: - -```ruby -Feature.disable(:devops_adoption_feature) -``` - -To enable it: - -```ruby -Feature.enable(:devops_adoption_feature) -``` diff --git a/ee/spec/features/admin/admin_dev_ops_report_spec.rb b/ee/spec/features/admin/admin_dev_ops_report_spec.rb index e90e307205cf8f679dd6c454efe115445a7c0ef7..aad41f077eed14708c583e9e57faf11ca53945ee 100644 --- a/ee/spec/features/admin/admin_dev_ops_report_spec.rb +++ b/ee/spec/features/admin/admin_dev_ops_report_spec.rb @@ -13,19 +13,7 @@ gitlab_enable_admin_mode_sign_in(admin) end - context 'with devops_adoption_feature feature flag disabled' do - before do - stub_feature_flags(devops_adoption_feature: false) - end - - it 'does not show the tabbed layout' do - visit admin_dev_ops_report_path - - expect(page).not_to have_selector tabs_selector - end - end - - context 'with ultimate license and devops_adoption_feature feature flag enabled' do + context 'with ultimate license' do before do stub_licensed_features(devops_adoption: true) end @@ -117,7 +105,7 @@ end end - context 'without ultimate license and devops_adoption_feature feature flag enabled' do + context 'without ultimate license' do before do stub_licensed_features(devops_adoption: false) end