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
db64746a
Commit
db64746a
authored
Feb 12, 2021
by
Miguel Rincon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sh-add-openid-sso-icon' into 'master'
Add OpenID SSO icon See merge request gitlab-org/gitlab!54026
parents
637a1578
a025cf73
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
app/assets/images/auth_buttons/openid_64.png
app/assets/images/auth_buttons/openid_64.png
+0
-0
app/helpers/auth_helper.rb
app/helpers/auth_helper.rb
+1
-1
changelogs/unreleased/sh-add-openid-sso-icon.yml
changelogs/unreleased/sh-add-openid-sso-icon.yml
+5
-0
spec/helpers/auth_helper_spec.rb
spec/helpers/auth_helper_spec.rb
+2
-2
No files found.
app/assets/images/auth_buttons/openid_64.png
0 → 100644
View file @
db64746a
1.87 KB
app/helpers/auth_helper.rb
View file @
db64746a
# frozen_string_literal: true
# frozen_string_literal: true
module
AuthHelper
module
AuthHelper
PROVIDERS_WITH_ICONS
=
%w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce atlassian_oauth2)
.
freeze
PROVIDERS_WITH_ICONS
=
%w(twitter github gitlab bitbucket google_oauth2 facebook azure_oauth2 authentiq salesforce atlassian_oauth2
openid_connect
)
.
freeze
LDAP_PROVIDER
=
/\Aldap/
.
freeze
LDAP_PROVIDER
=
/\Aldap/
.
freeze
def
ldap_enabled?
def
ldap_enabled?
...
...
changelogs/unreleased/sh-add-openid-sso-icon.yml
0 → 100644
View file @
db64746a
---
title
:
Add OpenID SSO icon
merge_request
:
54026
author
:
type
:
changed
spec/helpers/auth_helper_spec.rb
View file @
db64746a
...
@@ -73,12 +73,12 @@ RSpec.describe AuthHelper do
...
@@ -73,12 +73,12 @@ RSpec.describe AuthHelper do
describe
'enabled_button_based_providers'
do
describe
'enabled_button_based_providers'
do
before
do
before
do
allow
(
helper
).
to
receive
(
:auth_providers
)
{
[
:twitter
,
:github
,
:google_oauth2
]
}
allow
(
helper
).
to
receive
(
:auth_providers
)
{
[
:twitter
,
:github
,
:google_oauth2
,
:openid_connect
]
}
end
end
context
'all providers are enabled to sign in'
do
context
'all providers are enabled to sign in'
do
it
'returns all the enabled providers from settings'
do
it
'returns all the enabled providers from settings'
do
expect
(
helper
.
enabled_button_based_providers
).
to
include
(
'twitter'
,
'github'
,
'google_oauth2'
)
expect
(
helper
.
enabled_button_based_providers
).
to
include
(
'twitter'
,
'github'
,
'google_oauth2'
,
'openid_connect'
)
end
end
it
'puts google and github in the beginning'
do
it
'puts google and github in the beginning'
do
...
...
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