diff --git a/config/initializers/public_key.rb b/config/initializers/public_key.rb index d27e6519d1c..75d74e3625d 100644 --- a/config/initializers/public_key.rb +++ b/config/initializers/public_key.rb @@ -1,2 +1,2 @@ path = File.expand_path("~/.ssh/id_rsa.pub") -Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path) \ No newline at end of file +Gitlab::BitbucketImport.public_key = File.read(path) if File.exist?(path) diff --git a/lib/gitlab/bitbucket_import.rb b/lib/gitlab/bitbucket_import.rb index 0e53972ac50..7298152e7e9 100644 --- a/lib/gitlab/bitbucket_import.rb +++ b/lib/gitlab/bitbucket_import.rb @@ -3,4 +3,4 @@ module Gitlab mattr_accessor :public_key @public_key = nil end -end \ No newline at end of file +end diff --git a/spec/controllers/import/bitbucket_controller_spec.rb b/spec/controllers/import/bitbucket_controller_spec.rb index 84e37ae5607..5dd4124061c 100644 --- a/spec/controllers/import/bitbucket_controller_spec.rb +++ b/spec/controllers/import/bitbucket_controller_spec.rb @@ -5,6 +5,7 @@ describe Import::BitbucketController do before do sign_in(user) + controller.stub(:bitbucket_import_enabled?).and_return(true) end describe "GET callback" do diff --git a/spec/controllers/import/github_controller_spec.rb b/spec/controllers/import/github_controller_spec.rb index 3b779855d3f..b8820413406 100644 --- a/spec/controllers/import/github_controller_spec.rb +++ b/spec/controllers/import/github_controller_spec.rb @@ -5,6 +5,7 @@ describe Import::GithubController do before do sign_in(user) + controller.stub(:github_import_enabled?).and_return(true) end describe "GET callback" do diff --git a/spec/controllers/import/gitlab_controller_spec.rb b/spec/controllers/import/gitlab_controller_spec.rb index 287aa315db5..b6b86b1bcee 100644 --- a/spec/controllers/import/gitlab_controller_spec.rb +++ b/spec/controllers/import/gitlab_controller_spec.rb @@ -5,6 +5,7 @@ describe Import::GitlabController do before do sign_in(user) + controller.stub(:gitlab_import_enabled?).and_return(true) end describe "GET callback" do