Skip to content

Commit

Permalink
Merge branch 'rails5/force-html-for-file-errors' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lizconlan committed Apr 11, 2019
2 parents f014546 + 29e3316 commit 65b8ba6
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions app/controllers/request_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -586,10 +586,12 @@ def authenticate_attachment
raise ActiveRecord::RecordNotFound.new("Message not found") if incoming_message.nil?
if cannot?(:read, incoming_message.info_request)
@info_request = incoming_message.info_request # used by view
request.format = :html
return render_hidden
end
if cannot?(:read, incoming_message)
@incoming_message = incoming_message # used by view
request.format = :html
return render_hidden('request/hidden_correspondence')
end
# Is this a completely public request that we can cache attachments for
Expand Down

0 comments on commit 65b8ba6

Please sign in to comment.