projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '19297-inexistent-field-filter-fix'. Closes #19297
[arvados.git]
/
services
/
api
/
app
/
controllers
/
application_controller.rb
diff --git
a/services/api/app/controllers/application_controller.rb
b/services/api/app/controllers/application_controller.rb
index ff4cb88aec5a5ded76376f3d1a26b6b926bb5f7c..4625ef654c05cdd177cfa87312a67c677e9a2973 100644
(file)
--- a/
services/api/app/controllers/application_controller.rb
+++ b/
services/api/app/controllers/application_controller.rb
@@
-427,7
+427,7
@@
class ApplicationController < ActionController::Base
def append_info_to_payload(payload)
super
def append_info_to_payload(payload)
super
- payload[:request_id] = re
sponse.headers['X-Request-Id']
+ payload[:request_id] = re
quest.request_id
payload[:client_ipaddr] = @remote_ip
payload[:client_auth] = current_api_client_authorization.andand.uuid || nil
end
payload[:client_ipaddr] = @remote_ip
payload[:client_auth] = current_api_client_authorization.andand.uuid || nil
end
@@
-688,11
+688,6
@@
class ApplicationController < ActionController::Base
}
end
}
end
- def client_accepts_plain_text_stream
- (request.headers['Accept'].split(' ') &
- ['text/plain', '*/*']).count > 0
- end
-
def render *opts
if opts.first
response = opts.first[:json]
def render *opts
if opts.first
response = opts.first[:json]