Merge pull request #1593 from internetee/upgrade-rails-to-6.0.3

Upgrade Rails from 5.2 to 6.0.3
This commit is contained in:
Timo Võhmar 2020-06-03 15:04:36 +03:00 committed by GitHub
commit 2ffe9629f9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 272 additions and 112 deletions

View file

@ -44,7 +44,7 @@ module Api
# This controller does not inherit from ApplicationController,
# so user_for_paper_trail method is not usable.
def set_paper_trail_whodunnit
::PaperTrail.whodunnit = current_registrant_user.id_role_username
::PaperTrail.request.whodunnit = current_registrant_user.id_role_username
end
def show_not_found_error

View file

@ -118,7 +118,7 @@ module Epp
end
def render_epp_response(*args)
@response = render_to_string(*args, formats: 'xml')
@response = render_to_string(*args, formats: [:xml])
render xml: @response
write_to_epp_log
end