summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAlessio Caiazza <acaiazza@gitlab.com>2017-11-03 13:55:44 +0100
committerAlessio Caiazza <acaiazza@gitlab.com>2017-11-03 13:55:44 +0100
commite6616e0468deaf1e37ddddc9332cc3e677567410 (patch)
tree4ba0050161f732a4243faa83d0a56416d6d99c23 /app
parent44f885eff62cca07b60f8bb210733c4e0a2ea019 (diff)
downloadgitlab-ce-e6616e0468deaf1e37ddddc9332cc3e677567410.tar.gz
Fix typos
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects/clusters/applications_controller.rb18
-rw-r--r--app/services/clusters/applications/check_installation_progress_service.rb2
-rw-r--r--app/workers/cluster_wait_for_app_installation_worker.rb2
3 files changed, 9 insertions, 13 deletions
diff --git a/app/controllers/projects/clusters/applications_controller.rb b/app/controllers/projects/clusters/applications_controller.rb
index aa36ccac804..fae1ceb04b0 100644
--- a/app/controllers/projects/clusters/applications_controller.rb
+++ b/app/controllers/projects/clusters/applications_controller.rb
@@ -5,17 +5,13 @@ class Projects::Clusters::ApplicationsController < Projects::ApplicationControll
before_action :authorize_create_cluster!, only: [:create]
def create
- respond_to do |format|
- format.json do
- scheduled = Clusters::Applications::ScheduleInstallationService.new(project, current_user,
- application_class: @application_class,
- cluster: @cluster).execute
- if scheduled
- head :no_data
- else
- head :bad_request
- end
- end
+ scheduled = Clusters::Applications::ScheduleInstallationService.new(project, current_user,
+ application_class: @application_class,
+ cluster: @cluster).execute
+ if scheduled
+ head :no_data
+ else
+ head :bad_request
end
end
diff --git a/app/services/clusters/applications/check_installation_progress_service.rb b/app/services/clusters/applications/check_installation_progress_service.rb
index 7f5a633b749..cf96c128c2e 100644
--- a/app/services/clusters/applications/check_installation_progress_service.rb
+++ b/app/services/clusters/applications/check_installation_progress_service.rb
@@ -40,7 +40,7 @@ module Clusters
end
end
- def finilize_installation
+ def finalize_installation
FinalizeInstallationService.new(app).execute
end
diff --git a/app/workers/cluster_wait_for_app_installation_worker.rb b/app/workers/cluster_wait_for_app_installation_worker.rb
index 548f34fc6a5..4bb8c293e5d 100644
--- a/app/workers/cluster_wait_for_app_installation_worker.rb
+++ b/app/workers/cluster_wait_for_app_installation_worker.rb
@@ -3,7 +3,7 @@ class ClusterWaitForAppInstallationWorker
include ClusterQueue
include ClusterApplications
- INTERVAL = 30.seconds
+ INTERVAL = 10.seconds
TIMEOUT = 20.minutes
def perform(app_name, app_id)