Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into 38464-k8s-apps

1 files changed, 7 insertions, 7 deletions

diff --git a/app/models/clusters/concerns/application_status.rb b/app/models/clusters/concerns/application_status.rb
index 40140cb71cb..e73abfa9055 100644
--- a/app/models/clusters/concerns/application_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -12,20 +12,20 @@ module Clusters
           state :installing, value: 2
           state :installed, value: 3
 
+          event :make_scheduled do
+            transition %i(installable errored) => :scheduled
+          end
+
           event :make_installing do
-            transition any - [:installing] => :installing
+            transition %i(scheduled) => :installing
           end
 
           event :make_installed do
-            transition any - [:installed] => :installed
+            transition %i(installing) => :installed
           end
 
           event :make_errored do
-            transition any - [:errored] => :errored
-          end
-
-          event :make_scheduled do
-            transition %i(installable errored) => :scheduled
+            transition any => :errored
           end
 
           before_transition any => [:scheduled] do |app_status, _|