Merge branch 'master' into 3634-tab-state

[arvados.git] / services / api / app / models / arvados_model.rb

diff --git a/services/api/app/models/arvados_model.rb b/services/api/app/models/arvados_model.rb
index 2a98591a36ee10bae8826ff492840c7544f7a40f..2e17747839cb9819d22ad6e49487bb921172cef4 100644 (file)
--- a/services/api/app/models/arvados_model.rb
+++ b/services/api/app/models/arvados_model.rb
@@ -36,19 +36,18 @@ class ArvadosModel < ActiveRecord::Base
     end
   end
 
-  class UnauthorizedError < StandardError
+  class AlreadyLockedError < StandardError
     def http_status
-      401
+      403
     end
   end
 
-  class ConflictError < StandardError
+  class UnauthorizedError < StandardError
     def http_status
-      409
+      401
     end
   end
 
-
   def self.kind_class(kind)
     kind.match(/^arvados\#(.+)$/)[1].classify.safe_constantize rescue nil
   end