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

2012-08-24 15:25:52 +02:00 · 2012-08-24 15:25:52 +02:00 · 48443d20ca
commit 48443d20ca
parent c5ae1549a1 6d4ae75f54
114 changed files with 1524 additions and 1674 deletions
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@ -120,5 +120,8 @@ class Settings < Settingslogic
      omniauth['providers'] || []
    end

+    def disable_gravatar?
+      app['disable_gravatar'] || false
+    end
  end
 end
--- a/config/initializers/rails_footnotes.rb
+++ b/config/initializers/rails_footnotes.rb
@ -1,3 +0,0 @@
-#if defined?(Footnotes) && Rails.env.development?
-  #Footnotes.run! # first of all
-#end