projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
49933d0
)
fix double render
author
Tom Clegg <tom@clinicalfuture.com>
Thu, 7 Feb 2013 19:03:26 +0000
(14:03 -0500)
committer
Tom Clegg <tom@clinicalfuture.com>
Thu, 7 Feb 2013 19:03:26 +0000
(14:03 -0500)
app/controllers/application_controller.rb
patch
|
blob
|
history
diff --git
a/app/controllers/application_controller.rb
b/app/controllers/application_controller.rb
index 5c9bce9ba30eb97895a8ab0301a908c196be7800..6535888996304af716e9b12c1ab26b056960b0ff 100644
(file)
--- a/
app/controllers/application_controller.rb
+++ b/
app/controllers/application_controller.rb
@@
-56,7
+56,7
@@
class ApplicationController < ActionController::Base
def show
if !@object
- render_not_found("object not found")
+ re
turn re
nder_not_found("object not found")
end
respond_to do |f|
f.json { render json: @object }