projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e0ddde
)
Send HTTP 500 if we end up in render_error without a more specific status.
author
Tom Clegg <tom@curoverse.com>
Sun, 13 Apr 2014 05:14:05 +0000
(
01:14
-0400)
committer
Tom Clegg <tom@curoverse.com>
Sun, 13 Apr 2014 05:14:05 +0000
(
01:14
-0400)
apps/workbench/app/controllers/application_controller.rb
patch
|
blob
|
history
diff --git
a/apps/workbench/app/controllers/application_controller.rb
b/apps/workbench/app/controllers/application_controller.rb
index c169be27044ec5db6e0e8da8b67a0e75f8a1cf8d..1e4094dbc1498d5925719aaff97e88c995515235 100644
(file)
--- a/
apps/workbench/app/controllers/application_controller.rb
+++ b/
apps/workbench/app/controllers/application_controller.rb
@@
-30,6
+30,7
@@
class ApplicationController < ActionController::Base
end
def render_error(opts)
+ opts = {status: 500}.merge opts
respond_to do |f|
# json must come before html here, so it gets used as the
# default format when js is requested by the client. This lets