From 783bc436220dd8f7d667d2ba4a300983e6468a86 Mon Sep 17 00:00:00 2001
From: Brandon Labuschagne <blabuschagne@gitlab.com>
Date: Tue, 5 Jan 2021 11:38:12 +0200
Subject: [PATCH] Remove devops_adoption_feature flag

This commit remove thes devops_adoption_feature feature flag.
The flag was defaulted to true in 13.7 and is now being
removed in 13.8.
---
 app/views/admin/dev_ops_report/show.html.haml  |  2 +-
 .../development/devops_adoption_feature.yml    |  8 --------
 .../admin_area/analytics/dev_ops_report.md     | 18 ------------------
 .../admin/admin_dev_ops_report_spec.rb         | 16 ++--------------
 4 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 config/feature_flags/development/devops_adoption_feature.yml

diff --git a/app/views/admin/dev_ops_report/show.html.haml b/app/views/admin/dev_ops_report/show.html.haml
index 75398f3aa2177..19ce285162f5f 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 34ade24cbc66c..0000000000000
--- 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 8f629fd4250da..eb12dcbde9c5d 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.
 
 ![DevOps Report](img/dev_ops_adoption_v13_7.png)
-
-### 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 e90e307205cf8..aad41f077eed1 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
-- 
GitLab