Add Bitbucket importer.

2 files changed, 4 insertions, 8 deletions

diff --git a/lib/gitlab/gitlab_import/client.rb b/lib/gitlab/gitlab_import/client.rb
index 2206b68da99..ecf4ff94e39 100644
--- a/lib/gitlab/gitlab_import/client.rb
+++ b/lib/gitlab/gitlab_import/client.rb
@@ -9,7 +9,7 @@ module Gitlab
         @client = ::OAuth2::Client.new(
           config.app_id,
           config.app_secret,
-          github_options
+          gitlab_options
         )
 
         if access_token
@@ -70,12 +70,8 @@ module Gitlab
         Gitlab.config.omniauth.providers.find{|provider| provider.name == "gitlab"}
       end
 
-      def github_options
-        {
-          site: 'https://gitlab.com/',
-          authorize_url: 'oauth/authorize',
-          token_url: 'oauth/token'
-        }
+      def gitlab_options
+        OmniAuth::Strategies::GitLab.default_options[:client_options]
       end
     end
   end
diff --git a/lib/gitlab/gitlab_import/importer.rb b/lib/gitlab/gitlab_import/importer.rb
index 5f9b14399a4..c5304a0699b 100644
--- a/lib/gitlab/gitlab_import/importer.rb
+++ b/lib/gitlab/gitlab_import/importer.rb
@@ -25,7 +25,7 @@ module Gitlab
           end
 
           comments.each do |comment|
-            body += @formatter.comment_to_md(comment["author"]["name"], comment["created_at"], comment["body"])
+            body += @formatter.comment(comment["author"]["name"], comment["created_at"], comment["body"])
           end
 
           project.issues.create!(