Correct indentation in readme, fixed display of social accounts in profile
This commit is contained in:
parent
07aa6e5963
commit
98cf0ae338
16
README.md
16
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
|
### 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
|
### Run in development mode
|
||||||
|
|
||||||
Start it with [Foreman](https://github.com/ddollar/foreman)
|
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 rails s
|
||||||
bundle exec rake sidekiq:start
|
bundle exec rake sidekiq:start
|
||||||
|
|
||||||
### Run the tests
|
### Run the tests
|
||||||
|
|
||||||
|
|
|
@ -10,4 +10,10 @@ module OauthHelper
|
||||||
def enabled_oauth_providers
|
def enabled_oauth_providers
|
||||||
Devise.omniauth_providers
|
Devise.omniauth_providers
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def enabled_social_providers
|
||||||
|
enabled_oauth_providers.select do |name|
|
||||||
|
[:twitter, :github, :google_oauth2].include?(name.to_sym)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
%legend Social Accounts
|
%legend Social Accounts
|
||||||
.oauth_select_holder
|
.oauth_select_holder
|
||||||
%p.hint Tip: Click on icon to activate sigin with one of the following services
|
%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) }
|
%span{class: oauth_active_class(provider) }
|
||||||
= link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
|
= link_to authbutton(provider, 32), omniauth_authorize_path(User, provider)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue