diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-25 15:10:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-25 15:10:19 +0300 |
commit | e5d3d8c323872cb5dee33c5388b3157294c30343 (patch) | |
tree | 8d954820c1f876c9df58fc7ac06a181782822db4 /app/services/deployments | |
parent | 45760607bc053b7379f81edd5ea91dd2a6471522 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/deployments')
-rw-r--r-- | app/services/deployments/link_merge_requests_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/deployments/link_merge_requests_service.rb b/app/services/deployments/link_merge_requests_service.rb index 39fbef5dee2..40385418e48 100644 --- a/app/services/deployments/link_merge_requests_service.rb +++ b/app/services/deployments/link_merge_requests_service.rb @@ -16,7 +16,7 @@ module Deployments # Review apps have the environment type set (e.g. to `review`, though the # exact value may differ). We don't want to link merge requests to review # app deployments, as this is not useful. - return if deployment.environment.environment_type + return unless deployment.environment.should_link_to_merge_requests? # This service is triggered by a Sidekiq worker, which only runs when a # deployment is successful. We add an extra check here in case we ever |