Commit f95ec96e authored by Aakriti Gupta's avatar Aakriti Gupta Committed by Dmytro Zaporozhets

Add additional feature check for Group Activity

This is for when the feature flag is not set.
parent 766a8776
......@@ -78,7 +78,8 @@ module EE
end
def show_group_activity_analytics?
can?(current_user, :read_group_activity_analytics, @group)
::Feature.enabled?(:group_activity_analytics, @group) &&
can?(current_user, :read_group_activity_analytics, @group)
end
def show_usage_quotas_in_sidebar?
......
# frozen_string_literal: true
module QA
context 'Manage', :group_saml, :orchestrated, :requires_admin, quarantine: { issue: 'https://gitlab.com/gitlab-org/gitlab/-/issues/212378', type: :bug } do
context 'Manage', :group_saml, :orchestrated, :requires_admin do
describe 'Group SAML SSO - Non enforced SSO' do
include Support::Api
......
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