diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-17 16:59:50 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 15:07:24 +0100 |
| commit | ad6d6232342558705c54ba70a94f9d7ddbd00f8c (patch) | |
| tree | 2114eb91b0ddf6273909c364c1786747cd3d4827 /app/helpers/oauth_helper.rb | |
| parent | 7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff) | |
| download | gitlab-ce-ad6d6232342558705c54ba70a94f9d7ddbd00f8c.tar.gz | |
Add Bitbucket importer.
Diffstat (limited to 'app/helpers/oauth_helper.rb')
| -rw-r--r-- | app/helpers/oauth_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb index c7bc9307a58..848d74c18c3 100644 --- a/app/helpers/oauth_helper.rb +++ b/app/helpers/oauth_helper.rb @@ -4,7 +4,7 @@ module OauthHelper end def default_providers - [:twitter, :github, :gitlab, :google_oauth2, :ldap] + [:twitter, :github, :gitlab, :bitbucket, :google_oauth2, :ldap] end def enabled_oauth_providers @@ -13,7 +13,7 @@ module OauthHelper def enabled_social_providers enabled_oauth_providers.select do |name| - [:twitter, :gitlab, :github, :google_oauth2].include?(name.to_sym) + [:twitter, :gitlab, :github, :bitbucket, :google_oauth2].include?(name.to_sym) end end |