Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-27 14:42:22 +0300
committerRémy Coutable <remy@rymai.me>2016-06-30 19:48:17 +0300
commitce6635406c8e2e4d336d6d7738a1e4916036871c (patch)
tree630e743cfba4adc0e94c2020ed1e86efffc5704b /app/controllers/import/github_controller.rb
parent12aa1f898dbfea3aaeb2de351ac1cccef304717f (diff)
Make GH one-off auth the default again for importing GH projects
Advertise the PAT as an alternative unless GH import is not configured. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/controllers/import/github_controller.rb')
-rw-r--r--app/controllers/import/github_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/github_controller.rb b/app/controllers/import/github_controller.rb
index 95852c6941c..9c1b0eb20f4 100644
--- a/app/controllers/import/github_controller.rb
+++ b/app/controllers/import/github_controller.rb
@@ -1,6 +1,6 @@
class Import::GithubController < Import::BaseController
before_action :verify_github_import_enabled
- before_action :github_auth, except: [:callback, :new, :personal_access_token]
+ before_action :github_auth, only: [:status, :jobs, :create]
rescue_from Octokit::Unauthorized, with: :github_unauthorized