diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-07-24 11:28:55 +0000 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-07-24 11:28:55 +0000 |
| commit | 70de5114fbedf7c6a4557b10649003f5ccba6804 (patch) | |
| tree | 073482203083c6f36346d8468c5aa94439b3adf0 /lib/api/notes.rb | |
| parent | f84ba4c0262a60fb5e1f507261fb35706da6eb2a (diff) | |
| parent | 70a3c165a9f3882a82cf8946a783ace091635797 (diff) | |
| download | gitlab-ce-70de5114fbedf7c6a4557b10649003f5ccba6804.tar.gz | |
Merge branch 'auth-icons-labels' into 'master'
Allow custom label to be set for authentication providers.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2341
Beside the above, I've:
- Refactored `OauthHelper` to have clearer method names and behaviour
- Moved some of `OauthHelper` behaviour to `Gitlab::OAuth::Provider`
- Renamed `OauthHelper` to `AuthHelper` since LDAP, SAML, Kerberos aren't OAuth
- Updated the icons for GitHub and GitLab
In the examples below, "OurAuth" is a SAML provider with a custom label.
See merge request !927
Diffstat (limited to 'lib/api/notes.rb')
0 files changed, 0 insertions, 0 deletions