diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-11-04 15:23:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-11-04 15:23:38 +0000 |
| commit | 5df6b0b758821089c3685e3252b80c66ef6b1bc9 (patch) | |
| tree | 9a166ad13ca283fd586e1cfaa05886b2f6effaac /config | |
| parent | 3f05c22f5612c26ff3707aa16eb0f3c8be18ec93 (diff) | |
| parent | 05eb9e7884a1a1eb4144f84e7f586d26b011f4f1 (diff) | |
| download | gitlab-ce-5df6b0b758821089c3685e3252b80c66ef6b1bc9.tar.gz | |
Merge branch 'facebook-auth' into 'master'
Add Facebook authentication
See merge request !1740
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e297f393e3d..20894ebcdc9 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -274,27 +274,28 @@ production: &base # arguments, followed by optional 'args' which can be either a hash or an array. # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html providers: - # - { name: 'google_oauth2', - # label: 'Google', - # app_id: 'YOUR_APP_ID', - # app_secret: 'YOUR_APP_SECRET', - # args: { access_type: 'offline', approval_prompt: '' } } - # - { name: 'twitter', - # app_id: 'YOUR_APP_ID', - # app_secret: 'YOUR_APP_SECRET' } # - { name: 'github', - # label: 'GitHub', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET', # args: { scope: 'user:email' } } + # - { name: 'bitbucket', + # app_id: 'YOUR_APP_ID', + # app_secret: 'YOUR_APP_SECRET' } # - { name: 'gitlab', - # label: 'GitLab.com', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET', # args: { scope: 'api' } } - # - { name: 'bitbucket', + # - { name: 'google_oauth2', + # app_id: 'YOUR_APP_ID', + # app_secret: 'YOUR_APP_SECRET', + # args: { access_type: 'offline', approval_prompt: '' } } + # - { name: 'facebook', # app_id: 'YOUR_APP_ID', # app_secret: 'YOUR_APP_SECRET' } + # - { name: 'twitter', + # app_id: 'YOUR_APP_ID', + # app_secret: 'YOUR_APP_SECRET' } + # # - { name: 'saml', # label: 'Our SAML Provider', # args: { |