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

Link to oauth doc Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files

Merge branch 'link-to-oauth-doc' into 'master'
Link to oauth doc Possible after https://github.com/gitlabhq/gitlabhq/pull/6741/files
Dmitriy Zaporozhets
2 parents 09d4113a db1be88f
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
config/gitlab.yml.example
@@ -178,6 +178,7 @@ production: &amp;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',
...	...	@@ -178,6 +178,7 @@ production: &base
178	178	# see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Custom-omniauth-provider-configurations
179	179	# The 'app_id' and 'app_secret' parameters are always passed as the first two
180	180	# arguments, followed by optional 'args' which can be either a hash or an array.
	181	+ # Documentation for this is available at http://doc.gitlab.com/ce/integration/omniauth.html
181	182	providers:
182	183	# - { name: 'google_oauth2', app_id: 'YOUR APP ID',
183	184	# app_secret: 'YOUR APP SECRET',
...	...