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

Cleanup group_devops_adoption feature flag [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!64498

config/feature_flags/development/group_devops_adoption.yml

----
-name: group_devops_adoption
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55039
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/323159
-milestone: '13.10'
-type: development
-group: group::optimize
-default_enabled: true

doc/user/group/devops_adoption/index.md

@@ -7,14 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Group DevOps Adoption **(ULTIMATE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/321083) in GitLab 13.11 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/-/issues/323159) in GitLab 13.12.
-> - Enabled on GitLab.com.
-> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-group-devops-adoption). **(ULTIMATE SELF)**
-
-This in-development feature might not be available for your use. There can be
-[risks when enabling features still in development](../../feature_flags.md#risks-when-enabling-features-still-in-development).
-Refer to this feature's version history for more details.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/333556) in GitLab 14.1.
 
 Prerequisites:
 
@@ -64,12 +57,6 @@ Each group appears as a separate row in the table.
 For each row, a feature is considered "adopted" if it has been used in a project in the given group
 during the time period (including projects in any sub-groups of the given group).
 
-You should expect adoption to be lower at the beginning of the month,
-before you have had an opportunity to use all the features listed in the table.
-
-In the future [we plan to implement](https://gitlab.com/gitlab-org/gitlab/-/issues/329708)
-a rolling 30-day perspective instead.
-
 ## When is a feature considered adopted
 
 A feature is considered "adopted" if it has been used anywhere in the group in the specified time.
@@ -104,22 +91,3 @@ the data.
 Please note that the sub-group data might not appear immediately,
 because GitLab requires a few moments to collect the data.
 Generally the data will be visible in less than one minute.
-
-## Enable or disable Group DevOps Adoption **(ULTIMATE SELF)**
-
-Group DevOps Adoption is under development and not ready for production use. It 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 disable it.
-
-To disable it:
-
-```ruby
-Feature.disable(:group_devops_adoption)
-```
-
-To re-enable it:
-
-```ruby
-Feature.enable(:group_devops_adoption)
-```

ee/app/policies/ee/group_policy.rb

@@ -42,7 +42,6 @@ module EE
       end
 
       condition(:group_devops_adoption_enabled) do
-        ::Feature.enabled?(:group_devops_adoption, @subject, default_enabled: :yaml) &&
         ::License.feature_available?(:group_level_devops_adoption)
       end
 

ee/spec/policies/group_policy_spec.rb

@@ -1566,19 +1566,10 @@ RSpec.describe GroupPolicy do
     let(:current_user) { owner }
     let(:policy) { :view_group_devops_adoption }
 
-    context 'when feature is disabled' do
-      before do
-        stub_feature_flags(group_devops_adoption: false)
-      end
-
-      it { is_expected.to be_disallowed(policy) }
-    end
-
     context 'when license does not include the feature' do
       let(:current_user) { admin }
 
       before do
-        stub_feature_flags(group_devops_adoption: true)
         stub_licensed_features(group_level_devops_adoption: false)
         enable_admin_mode!(current_user)
       end
@@ -1586,7 +1577,7 @@ RSpec.describe GroupPolicy do
       it { is_expected.to be_disallowed(policy) }
     end
 
-    context 'when feature is enabled and license includes the feature' do
+    context 'when license includes the feature' do
       using RSpec::Parameterized::TableSyntax
 
       where(:role, :allowed) do
@@ -1600,7 +1591,6 @@ RSpec.describe GroupPolicy do
       end
 
       before do
-        stub_feature_flags(group_devops_adoption: true)
         stub_licensed_features(group_level_devops_adoption: true)
         enable_admin_mode!(current_user) if current_user.admin?
       end
@@ -1617,19 +1607,10 @@ RSpec.describe GroupPolicy do
     let(:current_user) { owner }
     let(:policy) { :manage_devops_adoption_namespaces }
 
-    context 'when feature is disabled' do
-      before do
-        stub_feature_flags(group_devops_adoption: false)
-      end
-
-      it { is_expected.to be_disallowed(policy) }
-    end
-
     context 'when license does not include the feature' do
       let(:current_user) { admin }
 
       before do
-        stub_feature_flags(group_devops_adoption: true)
         stub_licensed_features(group_level_devops_adoption: false)
         enable_admin_mode!(current_user)
       end
@@ -1637,60 +1618,54 @@ RSpec.describe GroupPolicy do
       it { is_expected.to be_disallowed(policy) }
     end
 
-    context 'when feature is enabled' do
-      before do
-        stub_feature_flags(group_devops_adoption: true)
-      end
-
-      context 'when license includes the feature' do
-        using RSpec::Parameterized::TableSyntax
+    context 'when license includes the feature' do
+      using RSpec::Parameterized::TableSyntax
 
-        where(:role, :allowed) do
-          :admin            | true
-          :owner            | true
-          :maintainer       | true
-          :developer        | true
-          :reporter         | true
-          :guest            | false
-          :non_group_member | false
-        end
+      where(:role, :allowed) do
+        :admin            | true
+        :owner            | true
+        :maintainer       | true
+        :developer        | true
+        :reporter         | true
+        :guest            | false
+        :non_group_member | false
+      end
 
-        before do
-          stub_licensed_features(group_level_devops_adoption: true)
-          enable_admin_mode!(current_user) if current_user.admin?
-        end
+      before do
+        stub_licensed_features(group_level_devops_adoption: true)
+        enable_admin_mode!(current_user) if current_user.admin?
+      end
 
-        with_them do
-          let(:current_user) { public_send(role) }
+      with_them do
+        let(:current_user) { public_send(role) }
 
-          it { is_expected.to(allowed ? be_allowed(policy) : be_disallowed(policy)) }
-        end
+        it { is_expected.to(allowed ? be_allowed(policy) : be_disallowed(policy)) }
       end
+    end
 
-      context 'when license plan does not include the feature' do
-        using RSpec::Parameterized::TableSyntax
+    context 'when license plan does not include the feature' do
+      using RSpec::Parameterized::TableSyntax
 
-        where(:role, :allowed) do
-          :admin            | true
-          :owner            | false
-          :maintainer       | false
-          :developer        | false
-          :reporter         | false
-          :guest            | false
-          :non_group_member | false
-        end
+      where(:role, :allowed) do
+        :admin            | true
+        :owner            | false
+        :maintainer       | false
+        :developer        | false
+        :reporter         | false
+        :guest            | false
+        :non_group_member | false
+      end
 
-        before do
-          stub_licensed_features(group_level_devops_adoption: true)
-          allow(group).to receive(:feature_available?).with(:group_level_devops_adoption).and_return(false)
-          enable_admin_mode!(current_user) if current_user.admin?
-        end
+      before do
+        stub_licensed_features(group_level_devops_adoption: true)
+        allow(group).to receive(:feature_available?).with(:group_level_devops_adoption).and_return(false)
+        enable_admin_mode!(current_user) if current_user.admin?
+      end
 
-        with_them do
-          let(:current_user) { public_send(role) }
+      with_them do
+        let(:current_user) { public_send(role) }
 
-          it { is_expected.to(allowed ? be_allowed(policy) : be_disallowed(policy)) }
-        end
+        it { is_expected.to(allowed ? be_allowed(policy) : be_disallowed(policy)) }
       end
     end
   end

ee/spec/requests/groups/analytics/devops_adoption_controller_spec.rb

@@ -10,7 +10,6 @@ RSpec.describe Groups::Analytics::DevopsAdoptionController do
     sign_in(current_user)
 
     stub_licensed_features(group_level_devops_adoption: true)
-    stub_feature_flags(group_devops_adoption: true)
   end
 
   describe 'GET show' do
@@ -28,18 +27,6 @@ RSpec.describe Groups::Analytics::DevopsAdoptionController do
       expect(response).to render_template :show
     end
 
-    context 'when the feature flag is false' do
-      before do
-        stub_feature_flags(group_devops_adoption: false)
-      end
-
-      it 'renders forbidden' do
-        subject
-
-        expect(response).to have_gitlab_http_status(:forbidden)
-      end
-    end
-
     context 'when the feature is not available' do
       before do
         stub_licensed_features(group_level_devops_adoption: false)

ee/spec/views/layouts/nav/sidebar/_group.html.haml_spec.rb

@@ -95,21 +95,9 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
 
         expect(rendered).to have_text 'DevOps Adoption'
       end
-
-      context 'feature flag is disabled' do
-        before do
-          stub_feature_flags(group_devops_adoption: false)
-        end
-
-        it 'is not visible' do
-          render
-
-          expect(rendered).not_to have_text 'DevOps Adoption'
-        end
-      end
     end
 
-    context 'DevOps apoption feature is not available' do
+    context 'DevOps adoption feature is not available' do
       before do
         stub_licensed_features(group_level_devops_adoption: false)
       end
@@ -119,18 +107,6 @@ RSpec.describe 'layouts/nav/sidebar/_group' do
 
         expect(rendered).not_to have_text 'DevOps Adoption'
       end
-
-      context 'feature flag is disabled' do
-        before do
-          stub_feature_flags(group_devops_adoption: false)
-        end
-
-        it 'is not visible' do
-          render
-
-          expect(rendered).not_to have_text 'DevOps Adoption'
-        end
-      end
     end
   end