Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents c727fdd0 fcfbb485
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/gitlab.yml.example
@@ -136,7 +136,7 @@ production: &amp;base
     ## Auth providers
     # Uncomment the following lines and fill in the data of the auth provider you want to use
     # If your favorite auth provider is not listed you can use others:
-    # see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers
+    # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Working-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.
     providers:
...	...	@@ -136,7 +136,7 @@ production: &base
136	136	## Auth providers
137	137	# Uncomment the following lines and fill in the data of the auth provider you want to use
138	138	# If your favorite auth provider is not listed you can use others:
139		- # see https://github.com/gitlabhq/gitlabhq/wiki/Using-Custom-Omniauth-Providers
	139	+ # see https://github.com/gitlabhq/gitlab-public-wiki/wiki/Working-custom-omniauth-provider-configurations
140	140	# The 'app_id' and 'app_secret' parameters are always passed as the first two
141	141	# arguments, followed by optional 'args' which can be either a hash or an array.
142	142	providers:
...	...