diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 06:07:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 06:07:46 +0300 |
| commit | b24ae1cbc66e5b0f622393bcf2c59711750161ea (patch) | |
| tree | de9514fdda81f7d8293612687026a87826b0d9dd /app/workers/deployments | |
| parent | 775816e676aae53509d7b6f364945f2720636f72 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/workers/deployments')
| -rw-r--r-- | app/workers/deployments/finished_worker.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/workers/deployments/finished_worker.rb b/app/workers/deployments/finished_worker.rb index bab197a82ff..6196b032f63 100644 --- a/app/workers/deployments/finished_worker.rb +++ b/app/workers/deployments/finished_worker.rb @@ -10,17 +10,9 @@ module Deployments def perform(deployment_id) if (deploy = Deployment.find_by_id(deployment_id)) - link_merge_requests(deploy) + LinkMergeRequestsService.new(deploy).execute deploy.execute_hooks end end - - def link_merge_requests(deployment) - unless Feature.enabled?(:deployment_merge_requests, deployment.project) - return - end - - LinkMergeRequestsService.new(deployment).execute - end end end |