Merge branch '335108-remove-feature-flag' into 'master'

Remove devops_adoption_feature feature flag

See merge request gitlab-org/gitlab!67861

config/feature_flags/development/devops_adoption_feature.yml

----
-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/325795
-milestone: '13.6'
-type: development
-group: group::optimize
-default_enabled: true

doc/user/admin_area/analytics/dev_ops_report.md

@@ -40,10 +40,6 @@ feature is available.
 ## DevOps Adoption **(ULTIMATE SELF)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/247112) in GitLab 13.7 as a [Beta feature](https://about.gitlab.com/handbook/product/gitlab-the-product/#beta).
-> - [Deployed behind a feature flag](../../../user/feature_flags.md), disabled by default.
-> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59267) in GitLab 14.0.
-> - Enabled on GitLab.com.
-> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#disable-or-enable-devops-adoption). **(ULTIMATE SELF)**
 > - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1.
 > - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1.
 > - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2.
@@ -76,21 +72,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/admin_devops_adoption_v14_2.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 reenable it:
-
-```ruby
-Feature.enable(:devops_adoption_feature)
-```

ee/app/controllers/ee/admin/dev_ops_report_controller.rb

@@ -13,10 +13,7 @@ module EE
       end
 
       def show_adoption?
-        feature_already_in_use = ::Analytics::DevopsAdoption::EnabledNamespace.any?
-
-        ::License.feature_available?(:devops_adoption) &&
-          (feature_already_in_use || ::Feature.enabled?(:devops_adoption_feature, default_enabled: :yaml))
+        ::License.feature_available?(:devops_adoption)
       end
     end
   end

ee/spec/controllers/admin/dev_ops_report_controller_spec.rb

@@ -13,21 +13,9 @@ RSpec.describe Admin::DevOpsReportController do
         stub_licensed_features(devops_adoption: true)
       end
 
-      it 'is true if there are any enabled_namespaces' do
-        create(:devops_adoption_enabled_namespace)
-
-        expect(controller.show_adoption?).to be true
-      end
-
-      it "is true if the 'devops_adoption_feature' feature is enabled" do
+      it 'is true' do
         expect(controller.show_adoption?).to be true
       end
-
-      it "is false if the 'devops_adoption_feature' feature is disabled" do
-        stub_feature_flags(devops_adoption_feature: false)
-
-        expect(controller.show_adoption?).to be false
-      end
     end
   end
 

ee/spec/features/admin/admin_dev_ops_report_spec.rb

@@ -27,19 +27,7 @@ RSpec.describe 'DevOps Report page', :js do
     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
@@ -169,7 +157,7 @@ RSpec.describe 'DevOps Report page', :js do
     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