Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-09-28 18:08:11 +0300
committerShinya Maeda <shinya@gitlab.com>2017-09-28 18:08:11 +0300
commitbda1b0a878205ac99bf10c0b4f0e63f2d4e3a25f (patch)
tree09d5318034ed17966be0fa74a7a4e07fde0b2c05 /app/services/ci
parentfabc359e77c39aea86f0eaa9f19b17b2a609dd99 (diff)
Databse foreing key, index, encrypt password. Use short path. Improve error handling. Polish.
Diffstat (limited to 'app/services/ci')
-rw-r--r--app/services/ci/create_cluster_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/ci/create_cluster_service.rb b/app/services/ci/create_cluster_service.rb
index bbf42ab2c8d..edae245ec38 100644
--- a/app/services/ci/create_cluster_service.rb
+++ b/app/services/ci/create_cluster_service.rb
@@ -10,11 +10,11 @@ module Ci
)
if operation&.status != ('RUNNING' || 'PENDING')
- raise UnexpectedOperationError
+ raise UnexpectedOperationError.new(operation&.status_message)
end
api_client.parse_self_link(operation.self_link).tap do |project_id, zone, operation_id|
- project.clusters.create(owner: current_user,
+ project.clusters.create(user: current_user,
gcp_project_id: params['gcp_project_id'],
cluster_zone: params['cluster_zone'],
cluster_name: params['cluster_name'],