diff options
| author | Tomasz Maczukin <tomasz@maczukin.pl> | 2015-11-04 23:45:27 +0100 |
|---|---|---|
| committer | Tomasz Maczukin <tomasz@maczukin.pl> | 2015-11-04 23:45:27 +0100 |
| commit | 3a52662ce3cb797a49f992d60bd976f03fbf1bb1 (patch) | |
| tree | 1993526294f1fd52124aaa4790e1136fb8f9c036 /app/helpers | |
| parent | 89ecba5e6cec6632c2f8e3baef6604b1b8ea0d45 (diff) | |
| parent | 95da91a66de5820a44989aa708338c24177cd10c (diff) | |
| download | gitlab-ce-3a52662ce3cb797a49f992d60bd976f03fbf1bb1.tar.gz | |
Merge branch 'master' into fix/visibility-level-setting-in-forked-projects
* master: (23 commits)
Use single spaces
Improvements to profile page UI
Replace all usages of `git` command with configurable binary path
Update Shell Commands doc for configurable git binary path
Minor reformatting for Facebook integration doc
Use proper labels for OAuth providers
Add Facebook authentication
Bump stamp to ~> 0.6.0
Add extra padding between user description and links on profile page
Fix tests
Fix clipboard button overflow
Apply new design for user profile page
Improve profile page UI
Better name for up-level links
Fixed User sorting specs
Only sort by IDs by default
Added benchmark for User.all
Add changelog entry for contacted_at
Spread out runner contacted_at updates
Only redirect to homepage url when its not the root url
...
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/auth_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb index cd99a232403..2c81ea1623c 100644 --- a/app/helpers/auth_helper.rb +++ b/app/helpers/auth_helper.rb @@ -1,5 +1,5 @@ module AuthHelper - PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2).freeze + PROVIDERS_WITH_ICONS = %w(twitter github gitlab bitbucket google_oauth2 facebook).freeze FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze def ldap_enabled? |