diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
| commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
| tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/models/deployment.rb | |
| parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
| download | gitlab-ce-13.6.0-rc42.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/models/deployment.rb')
| -rw-r--r-- | app/models/deployment.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/deployment.rb b/app/models/deployment.rb index 2d0d98136ec..36ac1bdb236 100644 --- a/app/models/deployment.rb +++ b/app/models/deployment.rb @@ -21,9 +21,7 @@ class Deployment < ApplicationRecord has_one :deployment_cluster - has_internal_id :iid, scope: :project, track_if: -> { !importing? }, init: ->(s) do - Deployment.where(project: s.project).maximum(:iid) if s&.project - end + has_internal_id :iid, scope: :project, track_if: -> { !importing? } validates :sha, presence: true validates :ref, presence: true @@ -79,8 +77,6 @@ class Deployment < ApplicationRecord after_transition any => :running do |deployment| deployment.run_after_commit do - next unless Feature.enabled?(:ci_send_deployment_hook_when_start, deployment.project) - Deployments::ExecuteHooksWorker.perform_async(id) end end |