diff options
author | James Lopez <james@gitlab.com> | 2019-06-10 12:31:05 +0300 |
---|---|---|
committer | James Lopez <james@gitlab.com> | 2019-06-10 12:31:05 +0300 |
commit | 895519a83e186071a6144917806250fb8da59036 (patch) | |
tree | e5a875cc4ee19b92b3e35ac751abb7b937fe1145 /app/controllers | |
parent | 1cc2aa5b39211b7db880eeb339969ca3220e07cc (diff) | |
parent | 1a4d1b05012bad8a9624ed52ea563a2d54a77716 (diff) |
Merge branch 'sh-fix-fogbugz-import' into 'master'
Fix Fogbugz Importer not working
Closes #33530
See merge request gitlab-org/gitlab-ce!29383
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/import/fogbugz_controller.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/import/fogbugz_controller.rb b/app/controllers/import/fogbugz_controller.rb index a37ba682b91..28ead8d44da 100644 --- a/app/controllers/import/fogbugz_controller.rb +++ b/app/controllers/import/fogbugz_controller.rb @@ -11,7 +11,7 @@ class Import::FogbugzController < Import::BaseController def callback begin - res = Gitlab::FogbugzImport::Client.new(import_params.symbolize_keys) + res = Gitlab::FogbugzImport::Client.new(import_params.to_h.symbolize_keys) rescue # 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') @@ -26,7 +26,7 @@ class Import::FogbugzController < Import::BaseController end def create_user_map - user_map = params[:users] + user_map = user_map_params.to_h[:users] unless user_map.is_a?(Hash) && user_map.all? { |k, v| !v[:name].blank? } flash.now[:alert] = _('All users must have a name.') @@ -99,6 +99,10 @@ class Import::FogbugzController < Import::BaseController params.permit(:uri, :email, :password) end + def user_map_params + params.permit(users: %w(name email gitlab_user)) + end + def verify_fogbugz_import_enabled render_404 unless fogbugz_import_enabled? end |