diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 4103550acdb5ba86404b68bd70bd1e5a1cfffd3c..c1266daffc30305381f7651063a8d4bcb15dfe1d 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',
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index ed3ab71862a61662315fa35b37e3920cc1695d1c..97946c54b40dad0976660da805da4d9102f81083 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -217,6 +217,15 @@ Devise.setup do |config|
   end
 
   Gitlab.config.omniauth.providers.each do |provider|
-    config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
+    case provider['args']
+    when Array
+      # An Array from the configuration will be expanded.
+      config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], *provider['args']
+    when Hash
+      # A Hash from the configuration will be passed as is.
+      config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret'], provider['args']
+    else
+      config.omniauth provider['name'].to_sym, provider['app_id'], provider['app_secret']
+    end
   end
 end