Merge branch 'timeouted' into 'master'

correct error message on helm tiller installation timeout

See merge request gitlab-org/gitlab-ce!20683

app/services/clusters/applications/check_installation_progress_service.rb

@@ -35,7 +35,7 @@ module Clusters
       def check_timeout
         if timeouted?
           begin
-            app.make_errored!('Installation timeouted')
+            app.make_errored!('Installation timed out')
           ensure
             remove_installation_pod
           end

spec/services/clusters/applications/check_installation_progress_service_spec.rb

@@ -43,7 +43,7 @@ describe Clusters::Applications::CheckInstallationProgressService do
           service.execute
 
           expect(application).to be_errored
-          expect(application.status_reason).to match(/\btimeouted\b/)
+          expect(application.status_reason).to match(/\btimed out\b/)
         end
       end
     end