master merged

1 files changed, 21 insertions, 5 deletions

diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index df9ccf32194..7a7ca43f1d0 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -6,7 +6,7 @@ class Settings < Settingslogic
       self.web['protocol'] ||= web.https ? "https" : "http"
     end
 
-    def web_host 
+    def web_host
       self.web['host'] ||= 'localhost'
     end
 
@@ -14,11 +14,11 @@ class Settings < Settingslogic
       self.email['from'] ||= ("notify@" + web_host)
     end
 
-    def url 
+    def url
       self['url'] ||= build_url
-    end 
+    end
 
-    def web_port 
+    def web_port
       if web.https
         web['port'] = 443
       else
@@ -36,7 +36,7 @@ class Settings < Settingslogic
       raw_url << web_host
 
       if web_custom_port?
-        raw_url << ":#{web_port}" 
+        raw_url << ":#{web_port}"
       end
 
       raw_url
@@ -120,6 +120,22 @@ class Settings < Settingslogic
       app['backup_keep_time'] || 0
     end
 
+    def ldap_enabled?
+      ldap && ldap['enabled']
+    rescue Settingslogic::MissingSetting
+      false
+    end
+
+    def omniauth_enabled?
+      omniauth && omniauth['enabled']
+    rescue Settingslogic::MissingSetting
+      false
+    end
+
+    def omniauth_providers
+      (omniauth_enabled? && omniauth['providers']) || []
+    end
+
     def disable_gravatar?
       app['disable_gravatar'] || false
     end