diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 17:19:00 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-14 17:19:00 +0400 |
| commit | 92b5e6b3bf997d330b9840422295e872a0ab0981 (patch) | |
| tree | 2f99d824259530aa141bad07d7c3ca31462351ee /config | |
| parent | 09d4113a31ab2f96ed4102a9beea6750ce9415b8 (diff) | |
| parent | db1be88f21aca737a375f87d4301a7fb20ac9822 (diff) | |
Merge branch 'link-to-oauth-doc' into 'master'
Link to oauth doc
Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 75ee4e2c880..64fc02fe8c2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -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', |