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

..

api

Merge branch 'merge-request-wip-information' into 'master'

2015-07-15 01:13:05 +00:00

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

Don't stop if database.sql.gz already exists

2015-07-21 10:37:27 +02:00

gitlab

Allow custom label to be set for authentication providers.

2015-07-23 15:20:12 +02:00

omni_auth

Add reset_session for the :reset_session strategy.

2015-04-24 20:10:32 +02:00

redcarpet/render

Fix typo.

2015-06-02 13:21:34 +02:00

support

Merge pull request #9400 from tuxillo/patch-1

2015-07-20 11:45:34 +02:00

tasks

Remove docs and rake task for gmail actions to prevent problems with registration.

2015-07-22 11:46:08 +02:00

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

email_validator.rb

More rubocop rules enable

2015-02-02 21:31:03 -08:00

event_filter.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

extracts_path.rb

Extract the longest-matching ref from a commit path when multiple matches occur

2015-07-01 07:01:59 -07:00

file_size_validator.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

gitlab.rb

Add lib/gitlab.rb to autoload non-conventional paths

2015-04-09 14:19:25 -04:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

diff unfold

2014-08-14 15:48:14 +04:00

version_check.rb

Replace host with real one

2015-05-11 18:21:45 +03:00