From a2ef52b32bd3d1ee70ea333566e330c44e6c9170 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 22 Aug 2016 15:36:41 -0300 Subject: Add custom OmniAuth strategy for Bitbucket OAuth2 --- config/initializers/omniauth.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'config') diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 26c30e523a7..ab5a0561b8c 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -26,3 +26,9 @@ if Gitlab.config.omniauth.enabled end end end + +module OmniAuth + module Strategies + autoload :Bitbucket, Rails.root.join('lib', 'omniauth', 'strategies', 'bitbucket') + end +end -- cgit v1.2.1 From 267e27b0cd543e8eeaa04686ad4678c4f553c479 Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Mon, 22 Aug 2016 16:05:44 -0300 Subject: Remove code to clone Bitbucket repositories using SSH --- config/initializers/public_key.rb | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 config/initializers/public_key.rb (limited to 'config') diff --git a/config/initializers/public_key.rb b/config/initializers/public_key.rb deleted file mode 100644 index e4f09a2d020..00000000000 --- a/config/initializers/public_key.rb +++ /dev/null @@ -1,2 +0,0 @@ -path = File.expand_path("~/.ssh/bitbucket_rsa.pub") -Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path) -- cgit v1.2.1