Correct indentation in readme, fixed display of social accounts in profile

diff --git a/README.md b/README.md
index 2d8113c..74bf393 100644 (file)
--- a/README.md
+++ b/README.md
@@ -83,24 +83,24 @@ Each month on the 22nd a new version is released together with an upgrade guide.
 
 ### Run in production mode
 
- The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually:
+The Installation guide contains instructions on how to download an init script and run it automatically on boot. You can also start the init script manually:
 
-        sudo service gitlab start
+    sudo service gitlab start
 
-  or by directly calling the script
+or by directly calling the script
 
-        sudo /etc/init.d/gitlab start
+     sudo /etc/init.d/gitlab start
 
 ### Run in development mode
 
 Start it with [Foreman](https://github.com/ddollar/foreman)
 
-        bundle exec foreman start -p 3000
+    bundle exec foreman start -p 3000
 
-  or start each component separately
+or start each component separately
 
-        bundle exec rails s
-        bundle exec rake sidekiq:start
+    bundle exec rails s
+    bundle exec rake sidekiq:start
 
 ### Run the tests
 

diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb
index 017c22d..c0177da 100644 (file)
--- a/app/helpers/oauth_helper.rb
+++ b/app/helpers/oauth_helper.rb
@@ -10,4 +10,10 @@ module OauthHelper
   def enabled_oauth_providers
     Devise.omniauth_providers
   end
+
+  def enabled_social_providers
+    enabled_oauth_providers.select do |name|
+      [:twitter, :github, :google_oauth2].include?(name.to_sym)
+    end
+  end
 end

diff --git a/app/views/profiles/account.html.haml b/app/views/profiles/account.html.haml
index 9bba73a..09d9ec1 100644 (file)
--- a/app/views/profiles/account.html.haml
+++ b/app/views/profiles/account.html.haml
@@ -4,7 +4,7 @@
       %legend Social Accounts
       .oauth_select_holder
         %p.hint Tip: Click on icon to activate sigin with one of the following services
-        - User.omniauth_providers.each do |provider|
+        - enabled_social_providers.each do |provider|
           %span{class: oauth_active_class(provider) }
             = link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)