Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f95ec96e
Commit
f95ec96e
authored
Apr 07, 2020
by
Aakriti Gupta
Committed by
Dmytro Zaporozhets
Apr 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add additional feature check for Group Activity
This is for when the feature flag is not set.
parent
766a8776
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
ee/app/helpers/ee/groups_helper.rb
ee/app/helpers/ee/groups_helper.rb
+2
-1
qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb
...ser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb
+1
-1
No files found.
ee/app/helpers/ee/groups_helper.rb
View file @
f95ec96e
...
@@ -78,6 +78,7 @@ module EE
...
@@ -78,6 +78,7 @@ module EE
end
end
def
show_group_activity_analytics?
def
show_group_activity_analytics?
::
Feature
.
enabled?
(
:group_activity_analytics
,
@group
)
&&
can?
(
current_user
,
:read_group_activity_analytics
,
@group
)
can?
(
current_user
,
:read_group_activity_analytics
,
@group
)
end
end
...
...
qa/qa/specs/features/ee/browser_ui/1_manage/group/group_saml_non_enforced_sso_spec.rb
View file @
f95ec96e
# 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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment