Merge branch 'ag-make-feature-ga' into 'master'

Remove feature flag for Group Activity Analytics

See merge request gitlab-org/gitlab!29261

ee/app/policies/ee/group_policy.rb

@@ -30,7 +30,7 @@ module EE
       end
 
       condition(:group_activity_analytics_available) do
-        @subject.feature_available?(:group_activity_analytics) && ::Feature.enabled?(:group_activity_analytics, @subject, type: :licensed, default_enabled: true)
+        @subject.feature_available?(:group_activity_analytics)
       end
 
       condition(:can_owners_manage_ldap, scope: :global) do

ee/spec/features/analytics/group_analytics_spec.rb

@@ -14,23 +14,9 @@ RSpec.describe 'GroupAnalytics' do
     sign_in(user)
   end
 
-  context 'when the feature is enabled' do
-    it 'renders the container' do
-      visit path
+  it 'renders the container' do
+    visit path
 
-      expect(page).to have_css('#js-group-activity')
-    end
-  end
-
-  context 'when the feature is disabled' do
-    before do
-      stub_feature_flags(group_activity_analytics: false)
-    end
-
-    it 'does not render the container' do
-      visit path
-
-      expect(page).not_to have_css('#js-group-activity')
-    end
+    expect(page).to have_css('#js-group-activity')
   end
 end

ee/spec/helpers/ee/groups_helper_spec.rb

@@ -157,7 +157,6 @@ RSpec.describe GroupsHelper do
 
   describe '#show_group_activity_analytics?' do
     before do
-      stub_feature_flags(group_activity_analytics: feature_available)
       stub_licensed_features(group_activity_analytics: feature_available)
 
       allow(helper).to receive(:current_user) { current_user }

ee/spec/policies/group_policy_spec.rb

@@ -176,7 +176,6 @@ RSpec.describe GroupPolicy do
     let(:current_user) { developer }
 
     before do
-      stub_feature_flags(group_activity_analytics: true)
       stub_licensed_features(group_activity_analytics: true)
     end
 
@@ -187,7 +186,6 @@ RSpec.describe GroupPolicy do
     let(:current_user) { developer }
 
     before do
-      stub_feature_flags(group_activity_analytics: false)
       stub_licensed_features(group_activity_analytics: false)
     end
 

ee/spec/requests/api/analytics/group_activity_analytics_spec.rb

@@ -13,7 +13,6 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
 
   shared_examples 'GET group_activity' do |activity, count|
     let(:feature_available) { true }
-    let(:feature_enabled) { true }
     let(:params) { { group_path: group.full_path } }
     let(:current_user) { reporter }
     let(:request) do
@@ -22,7 +21,6 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
 
     before do
       stub_licensed_features(group_activity_analytics: feature_available)
-      stub_feature_flags(group_activity_analytics: feature_enabled)
 
       request
     end
@@ -39,15 +37,6 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
 
     context 'when feature is not available in plan' do
       let(:feature_available) { false }
-      let(:feature_enabled) { false }
-
-      it 'is returns `forbidden`' do
-        expect(response).to have_gitlab_http_status(:forbidden)
-      end
-    end
-
-    context 'when feature is disabled globally' do
-      let(:feature_enabled) { false }
 
       it 'is returns `forbidden`' do
         expect(response).to have_gitlab_http_status(:forbidden)