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
99bdebd5
Commit
99bdebd5
authored
Jun 15, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group SAML settings link checks license
parent
6e24d965
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
ee/app/helpers/ee/saml_providers_helper.rb
ee/app/helpers/ee/saml_providers_helper.rb
+6
-2
ee/changelogs/unreleased/jej-group-saml-settings-link-checks-license.yml
...nreleased/jej-group-saml-settings-link-checks-license.yml
+5
-0
No files found.
ee/app/helpers/ee/saml_providers_helper.rb
View file @
99bdebd5
module
EE
module
SamlProvidersHelper
def
group_saml_
enabl
ed?
def
group_saml_
configur
ed?
::
Gitlab
::
Auth
::
GroupSaml
::
Config
.
enabled?
end
def
show_saml_in_sidebar?
(
group
)
group_saml_enabled?
&&
!
group
.
subgroup?
&&
can?
(
current_user
,
:admin_group_saml
,
group
)
return
false
unless
group_saml_configured?
return
false
unless
group
.
feature_available?
(
:group_saml
)
return
false
if
group
.
subgroup?
can?
(
current_user
,
:admin_group_saml
,
group
)
end
def
saml_link_for_provider
(
text
,
provider
,
*
args
)
...
...
ee/changelogs/unreleased/jej-group-saml-settings-link-checks-license.yml
0 → 100644
View file @
99bdebd5
---
title
:
Group SAML settings link hidden when unlicensed
merge_request
:
6147
author
:
type
:
fixed
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