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:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-17 00:07:22 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-17 00:07:22 +0300
commite924e9e7cb9df21b3bc3d51d5f955da28ba3a225 (patch)
tree598ccb6f09e55ad06e628a90d27628f20ae693fe /app/models/clusters/concerns
parent8e45d25f7dde6508839ffee719c0ddc2cf6b12d3 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/clusters/concerns')
-rw-r--r--app/models/clusters/concerns/provider_status.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/clusters/concerns/provider_status.rb b/app/models/clusters/concerns/provider_status.rb
index 4d1974777ea..2da1ee7aabb 100644
--- a/app/models/clusters/concerns/provider_status.rb
+++ b/app/models/clusters/concerns/provider_status.rb
@@ -42,6 +42,10 @@ module Clusters
def on_creation?
scheduled? || creating?
end
+
+ def assign_operation_id(_)
+ # Implemented by individual providers if operation ID is supported.
+ end
end
end
end