diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-04-24 18:37:29 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-04-30 21:15:39 +0700 |
| commit | daa8f784d016091fd2a56fd195cbd6da2f199350 (patch) | |
| tree | 0176ed1b51776ca2224b4309ee180d269c9b0453 /app/services/merge_requests/base_service.rb | |
| parent | a96e96d5c8829348fed969d00395be93290577d4 (diff) | |
| download | gitlab-ce-daa8f784d016091fd2a56fd195cbd6da2f199350.tar.gz | |
Fix environment automatic on_stop trigger
Due to the nature of pipelines for merge requests, deployments.ref can
be a merge request ref instead of a branch name.
We support the environment auto-stop hook for this case
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
| -rw-r--r-- | app/services/merge_requests/base_service.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb index b8334a87f6d..a9dd26c02ad 100644 --- a/app/services/merge_requests/base_service.rb +++ b/app/services/merge_requests/base_service.rb @@ -24,6 +24,11 @@ module MergeRequests end end + def cleanup_environments(merge_request) + Ci::StopEnvironmentsService.new(merge_request.source_project, current_user) + .execute_for_merge_request(merge_request) + end + private def handle_wip_event(merge_request) |