diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-16 15:58:53 -0800 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-16 15:58:53 -0800 |
| commit | 9f1e9f11f1e66d0b6f22dba2870a2372c091b3bb (patch) | |
| tree | a49b28db365612d66da32d13b79f86be6ddc8a89 /config/gitlab.yml.example | |
| parent | 9cab79cbe640ba8ec842b2f5103871ae447ab1ab (diff) | |
| parent | aec1a84042a789bc5a7926ec91b49c2b689e081d (diff) | |
| download | gitlab-ce-9f1e9f11f1e66d0b6f22dba2870a2372c091b3bb.tar.gz | |
Merge pull request #2346 from sodabrew/omniauth_configs
Allow the OmniAuth provider args parameter to be passed through
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 4103550acdb..c1266daffc3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -72,6 +72,8 @@ omniauth: # Uncomment the lines and fill in the data of the auth provider you want to use # If your favorite auth provider is not listed you can user others: # see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers + # 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. providers: # - { name: 'google_oauth2', app_id: 'YOUR APP ID', # app_secret: 'YOUR APP SECRET', |