projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into 2290-user-activity
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
jobs_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/jobs_controller.rb
b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index 5c2f5db6cf9683a3b2f6b0904381c42c6e4ddd49..a715d0ef29d8117dea8de020af6084234af2e52d 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/jobs_controller.rb
@@
-6,6
+6,7
@@
class Arvados::V1::JobsController < ApplicationController
skip_before_filter :render_404_if_no_object, :only => :queue
def index
+ return super unless @where.is_a? Hash
want_ancestor = @where[:script_version_descends_from]
if want_ancestor
# Check for missing commit_ancestor rows, and create them if