Merge branch 'dc-feature-flag-cleanup' into 'master'

Separate repository analytics and group coverage licensing

See merge request gitlab-org/gitlab!44478

doc/user/group/repositories_analytics/index.md

@@ -7,11 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Repositories Analytics **(PREMIUM)**
 
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215104) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.4.
-> - It's [deployed behind a feature flag](../../feature_flags.md), enabled by default.
-> - It's enabled on GitLab.com.
-> - It's recommended for production use.
-> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-repositories-analytics). **(CORE ONLY)**
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/215104) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.4.
 
 CAUTION: **Warning:**
 This feature might not be available to you. Check the **version history** note above for details.
@@ -35,25 +31,6 @@ For each day that a coverage report was generated by a job in a project's pipeli
 
 If the project's code coverage was calculated more than once in a day, we will take the last value from that day.
 
-## Enable or disable Repositories Analytics **(CORE ONLY)**
-
-Repositories Analytics is under development but 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 opt to disable it.
-
-To enable it:
-
-```ruby
-Feature.enable(:group_coverage_reports)
-```
-
-To disable it:
-
-```ruby
-Feature.disable(:group_coverage_reports)
-```
-
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues

ee/app/controllers/groups/analytics/coverage_reports_controller.rb

@@ -5,7 +5,6 @@ class Groups::Analytics::CoverageReportsController < Groups::Analytics::Applicat
 
   before_action :load_group
   before_action -> { check_feature_availability!(:group_coverage_reports) }
-  before_action :check_feature_flag
 
   def index
     respond_to do |format|
@@ -51,8 +50,4 @@ class Groups::Analytics::CoverageReportsController < Groups::Analytics::Applicat
       value: @group.id
     }
   end
-
-  def check_feature_flag
-    render_404 unless @group.feature_available?(:group_coverage_reports)
-  end
 end

ee/app/controllers/groups/analytics/repository_analytics_controller.rb

@@ -4,7 +4,6 @@ class Groups::Analytics::RepositoryAnalyticsController < Groups::Analytics::Appl
   layout 'group'
 
   before_action :load_group
-  before_action :check_feature_flag
   before_action -> { check_feature_availability!(:group_repository_analytics) }
   before_action -> { authorize_view_by_action!(:read_group_repository_analytics) }
   before_action -> { push_frontend_feature_flag(:group_coverage_data_report, @group, default_enabled: false) }
@@ -21,8 +20,4 @@ class Groups::Analytics::RepositoryAnalyticsController < Groups::Analytics::Appl
       value: @group.id
     }
   end
-
-  def check_feature_flag
-    render_404 unless @group.feature_available?(:group_coverage_reports)
-  end
 end

ee/spec/controllers/groups/analytics/repository_analytics_controller_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Groups::Analytics::RepositoryAnalyticsController do
   before do
     sign_in(current_user)
 
-    stub_licensed_features(feature_name => true, :group_coverage_reports => true)
+    stub_licensed_features(feature_name => true)
   end
 
   describe 'GET show', :snowplow do
@@ -35,20 +35,12 @@ RSpec.describe Groups::Analytics::RepositoryAnalyticsController do
 
     context 'when license is missing' do
       before do
-        stub_licensed_features(feature_name => false, :group_coverage_reports => true)
+        stub_licensed_features(feature_name => false)
       end
 
       it { is_expected.to have_gitlab_http_status(:forbidden) }
     end
 
-    context 'when `group_repository_analytics` licensed feature flag is off' do
-      before do
-        stub_feature_flags(group_coverage_reports: false)
-      end
-
-      it { is_expected.to have_gitlab_http_status(:not_found) }
-    end
-
     context 'when the user has no access to the group' do
       before do
         current_user.group_members.delete_all