Commit 59c6c59b authored by Markus Koller's avatar Markus Koller

Merge branch '29261-enable-group-activity-feature-by-default' into 'master'

Move Group Activity Analytics from beta to GA

Closes #29261

See merge request gitlab-org/gitlab!40916
parents de6fba24 bf85cdb6
......@@ -26,7 +26,7 @@ module EE
end
condition(:group_activity_analytics_available) do
@subject.beta_feature_available?(:group_activity_analytics)
@subject.feature_available?(:group_activity_analytics) && ::Feature.enabled?(:group_activity_analytics, @subject, default_enabled: true)
end
condition(:can_owners_manage_ldap, scope: :global) do
......
---
title: Move group activity analytics from beta to general availability
merge_request: 40916
author:
type: changed
......@@ -13,7 +13,7 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
shared_examples 'GET group_activity' do |activity, count|
let(:feature_available) { true }
let(:feature_enabled_for) { group }
let(:feature_enabled) { true }
let(:params) { { group_path: group.full_path } }
let(:current_user) { reporter }
let(:request) do
......@@ -21,8 +21,8 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
end
before do
stub_feature_flags(group_activity_analytics: feature_enabled_for)
stub_licensed_features(group_activity_analytics: feature_available)
stub_feature_flags(group_activity_analytics: feature_enabled)
request
end
......@@ -39,7 +39,7 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
context 'when feature is not available in plan' do
let(:feature_available) { false }
let(:feature_enabled_for) { false }
let(:feature_enabled) { false }
it 'is returns `forbidden`' do
expect(response).to have_gitlab_http_status(:forbidden)
......@@ -47,7 +47,7 @@ RSpec.describe API::Analytics::GroupActivityAnalytics do
end
context 'when feature is disabled globally' do
let(:feature_enabled_for) { false }
let(:feature_enabled) { false }
it 'is returns `forbidden`' do
expect(response).to have_gitlab_http_status(:forbidden)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment