diff options
author | Jared Szechy <jared.szechy@gmail.com> | 2015-09-15 22:23:30 +0300 |
---|---|---|
committer | Jared Szechy <jared.szechy@gmail.com> | 2015-09-15 22:23:30 +0300 |
commit | 93bb8f14ef2b19128c078250b36c62f681f30ee0 (patch) | |
tree | 48b265846815226a3376ed4ec2d995debf176b35 /app/controllers | |
parent | bc10a48c9789ab193177e6b2443e29e31cf539e5 (diff) |
Use fixed version of fogbugz gem
This allows us to properly handle authentication errors.
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/import/fogbugz_controller.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb index bda534fb4de..849646cd665 100644 --- a/app/controllers/import/fogbugz_controller.rb +++ b/app/controllers/import/fogbugz_controller.rb @@ -2,7 +2,6 @@ class Import::FogbugzController < Import::BaseController before_action :verify_fogbugz_import_enabled before_action :user_map, only: [:new_user_map, :create_user_map] - # Doesn't work yet due to bug in ruby-fogbugz, see below rescue_from Fogbugz::AuthenticationException, with: :fogbugz_unauthorized def new @@ -13,8 +12,8 @@ class Import::FogbugzController < Import::BaseController begin res = Gitlab::FogbugzImport::Client.new(import_params.symbolize_keys) rescue - # Needed until https://github.com/firmafon/ruby-fogbugz/pull/9 is merged - return redirect_to :back, alert: 'Could not authenticate with FogBugz, check your URL, email, and password' + # If the URI is invalid various errors can occur + return redirect_to new_import_fogbugz_path, alert: 'Could not connect to FogBugz, check your URL' end session[:fogbugz_token] = res.get_token session[:fogbugz_uri] = params[:uri] @@ -92,8 +91,7 @@ class Import::FogbugzController < Import::BaseController end def fogbugz_unauthorized(exception) - flash[:alert] = exception.message - redirect_to new_import_fogbugz_path + redirect_to new_import_fogbugz_path, alert: exception.message end def import_params |