Merge branch 'master' into 2290-user-activity

[arvados.git] / services / api / app / controllers / arvados / v1 / virtual_machines_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
index 4f09f2892c8aeb4929158d4a4a377f2d7d694e03..10b4bd8cc60e2675e714afc321d74183556acc01 100644 (file)
--- a/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
+++ b/services/api/app/controllers/arvados/v1/virtual_machines_controller.rb
@@ -1,9 +1,10 @@
 class Arvados::V1::VirtualMachinesController < ApplicationController
+  skip_before_filter :find_object_by_uuid, :only => :get_all_logins
+  skip_before_filter :render_404_if_no_object, :only => :get_all_logins
   skip_before_filter(:require_auth_scope_all,
                      :only => [:logins, :get_all_logins])
   before_filter(:admin_required,
                 :only => [:logins, :get_all_logins])
-  before_filter(:find_object_by_uuid, :only => :logins)
   before_filter(:require_auth_scope_for_get_all_logins,
                 :only => [:logins, :get_all_logins])