Merge branch 'link-to-oauth-doc' into 'master'

Link to oauth doc

Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
This commit is contained in:
Dmitriy Zaporozhets 2014-04-14 13:19:00 +00:00
commit 92b5e6b3bf

View file

@ -178,6 +178,7 @@ production: &base
# see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations
# The 'app_id' and 'app_secret' parameters are always passed as the first two
# 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', app_id: 'YOUR APP ID',
# app_secret: 'YOUR APP SECRET',