gitlab-org--gitlab-foss

kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss

History

Valery Sizov 70de5114fb 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. ![Screen_Shot_2015-07-02_at_16.29.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d425bde69dc34e1667ebd5375d0266d/Screen_Shot_2015-07-02_at_16.29.52.png) ![Screen_Shot_2015-07-02_at_16.31.40](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cbb273321ecdf4cab3d3ef0dc35553e7/Screen_Shot_2015-07-02_at_16.31.40.png) ![Screen_Shot_2015-07-02_at_16.32.39](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d8dd6e1d0dc45a788e869cdcdc99e178/Screen_Shot_2015-07-02_at_16.32.39.png) ![Screen_Shot_2015-07-02_at_16.33.18](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7dbfe8b0ae229c32a08d6c7442976d83/Screen_Shot_2015-07-02_at_16.33.18.png) See merge request !927		2015-07-24 11:28:55 +00:00
..
assets	Merge branch 'auth-icons-labels' into 'master'	2015-07-24 11:28:55 +00:00
controllers	Add User.find_by_username!	2015-07-23 17:16:39 -04:00
finders	Rename NoMilestone to Milestone::None	2015-07-06 22:39:55 -04:00
helpers	Allow custom label to be set for authentication providers.	2015-07-23 15:20:12 +02:00
mailers
models	Merge branch 'rs-issue-2012' into 'master'	2015-07-24 09:29:58 +00:00
services	Return true/false from AutoMergeService#merge!	2015-07-23 13:10:32 +02:00
uploaders
views	Merge branch 'auth-icons-labels' into 'master'	2015-07-24 11:28:55 +00:00
workers	Avoid cache building for super-weird case when repository root_ref is nil	2015-07-17 16:03:38 +02:00