summaryrefslogtreecommitdiff
path: root/app/controllers/import/fogbugz_controller.rb
diff options
context:
space:
mode:
authorLuke Bennett <lbennett@gitlab.com>2018-09-24 14:39:00 +0100
committerLuke Bennett <lbennett@gitlab.com>2018-09-24 14:39:00 +0100
commit05afd11e16aecd43adfb869ae90aa6cae13916ec (patch)
tree63b31431981d48ac970853778dd01a5301bb9564 /app/controllers/import/fogbugz_controller.rb
parent086549d986a453e1b2dd0d09ffbd19d0487d9c51 (diff)
parent28086b203ae397e01d5e9870dfbddd66466450c2 (diff)
downloadgitlab-ce-05afd11e16aecd43adfb869ae90aa6cae13916ec.tar.gz
Merge remote-tracking branch 'origin/master' into ce-6983-promote-starting-a-gitlab-com-trial
Diffstat (limited to 'app/controllers/import/fogbugz_controller.rb')
-rw-r--r--app/controllers/import/fogbugz_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb
index 2d665e05ac3..df96d181153 100644
--- a/app/controllers/import/fogbugz_controller.rb
+++ b/app/controllers/import/fogbugz_controller.rb
@@ -39,6 +39,7 @@ class Import::FogbugzController < Import::BaseController
redirect_to status_import_fogbugz_path
end
+ # rubocop: disable CodeReuse/ActiveRecord
def status
unless client.valid?
return redirect_to new_import_fogbugz_path
@@ -51,6 +52,7 @@ class Import::FogbugzController < Import::BaseController
@repos.reject! { |repo| already_added_projects_names.include? repo.name }
end
+ # rubocop: enable CodeReuse/ActiveRecord
def jobs
render json: find_jobs('fogbugz')