Load public key in initializer.

3 files changed, 15 insertions, 0 deletions

diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb
index 27e91f49f2b..89de5c5205f 100644
--- a/app/controllers/import/bitbucket_controller.rb
+++ b/app/controllers/import/bitbucket_controller.rb
@@ -1,4 +1,5 @@
 class Import::BitbucketController < Import::BaseController
+  before_filter :verify_bitbucket_import_enabled
   before_filter :bitbucket_auth, except: :callback
 
   # rescue_from OAuth::Error, with: :bitbucket_unauthorized
@@ -55,6 +56,10 @@ class Import::BitbucketController < Import::BaseController
     @client ||= Gitlab::BitbucketImport::Client.new(current_user.bitbucket_access_token, current_user.bitbucket_access_token_secret)
   end
 
+  def verify_bitbucket_import_enabled
+    not_found! unless bitbucket_import_enabled?
+  end
+
   def bitbucket_auth
     if current_user.bitbucket_access_token.blank?
       go_to_bitbucket_for_permissions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index c869c7c86f3..dc7668ee6fd 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -1,4 +1,5 @@
 class Import::GithubController < Import::BaseController
+  before_filter :verify_github_import_enabled
   before_filter :github_auth, except: :callback
 
   rescue_from Octokit::Unauthorized, with: :github_unauthorized
@@ -44,6 +45,10 @@ class Import::GithubController < Import::BaseController
     @client ||= Gitlab::GithubImport::Client.new(current_user.github_access_token)
   end
 
+  def verify_github_import_enabled
+    not_found! unless github_import_enabled?
+  end
+
   def github_auth
     if current_user.github_access_token.blank?
       go_to_github_for_permissions
diff --git a/app/controllers/import/gitlab_controller.rb b/app/controllers/import/gitlab_controller.rb
index a51ea36aff8..74f992b4699 100644
--- a/app/controllers/import/gitlab_controller.rb
+++ b/app/controllers/import/gitlab_controller.rb
@@ -1,4 +1,5 @@
 class Import::GitlabController < Import::BaseController
+  before_filter :verify_gitlab_import_enabled
   before_filter :gitlab_auth, except: :callback
 
   rescue_from OAuth2::Error, with: :gitlab_unauthorized
@@ -41,6 +42,10 @@ class Import::GitlabController < Import::BaseController
     @client ||= Gitlab::GitlabImport::Client.new(current_user.gitlab_access_token)
   end
 
+  def verify_gitlab_import_enabled
+    not_found! unless gitlab_import_enabled?
+  end
+
   def gitlab_auth
     if current_user.gitlab_access_token.blank?
       go_to_gitlab_for_permissions