summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-17 16:59:50 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-24 15:07:24 +0100
commitad6d6232342558705c54ba70a94f9d7ddbd00f8c (patch)
tree2114eb91b0ddf6273909c364c1786747cd3d4827 /app/helpers
parent7561b1c2a486ae57e9fbebadadbe1269bfdba6a0 (diff)
downloadgitlab-ce-ad6d6232342558705c54ba70a94f9d7ddbd00f8c.tar.gz
Add Bitbucket importer.
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/oauth_helper.rb4
-rw-r--r--app/helpers/projects_helper.rb4
2 files changed, 6 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
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 900afde4d9b..8a48a9d3946 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -273,4 +273,8 @@ module ProjectsHelper
def gitlab_import_enabled?
enabled_oauth_providers.include?(:gitlab)
end
+
+ def bitbucket_import_enabled?
+ enabled_oauth_providers.include?(:bitbucket)
+ end
end