Commit e60e387e authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch 'ag-add-additional-feature-check' into 'master'

Add additional feature check for Group Activity

See merge request gitlab-org/gitlab!28900
parents 390da1f4 f95ec96e
...@@ -78,7 +78,8 @@ module EE ...@@ -78,7 +78,8 @@ module EE
end end
def show_group_activity_analytics? 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 end
def show_usage_quotas_in_sidebar? def show_usage_quotas_in_sidebar?
......
# frozen_string_literal: true # frozen_string_literal: true
module QA 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 describe 'Group SAML SSO - Non enforced SSO' do
include Support::Api 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