Merge branch 'master' into 2681-new-inactive-user-notification
[arvados.git] / services / api / app / models / job.rb
index d3c3b1d64091bf11ae420f4568c15bbe86479291..fbc5640b3762fef94934ed271d8501b78c31ac14 100644 (file)
@@ -1,5 +1,5 @@
 class Job < ArvadosModel
-  include AssignUuid
+  include HasUuid
   include KindAndEtag
   include CommonApiTemplate
   serialize :script_parameters, Hash
@@ -86,7 +86,7 @@ class Job < ArvadosModel
       return true
     end
     if new_record? or script_version_changed?
-      sha1 = Commit.find_commit_range(current_user, nil, nil, self.script_version, nil)[0] rescue nil
+      sha1 = Commit.find_commit_range(current_user, self.repository, nil, self.script_version, nil)[0] rescue nil
       if sha1
         self.script_version = sha1
       else