diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 18:07:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-03 18:07:15 +0300 |
| commit | fdd5c2a476dade1dd0874e37ab0c0b9ff88381ab (patch) | |
| tree | 4abb334a7f0fab9698e20e2e6e672abc66c37113 /app/models/merge_request.rb | |
| parent | a3759fc2e1f8aa1493840ab0d4ebd4a2e5f495aa (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index cccf2c918b0..6987bccadcb 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -733,7 +733,7 @@ class MergeRequest < ApplicationRecord def merge_participants participants = [author] - if auto_merge_enabled? && participants.exclude?(merge_user) + if auto_merge_enabled? && !participants.include?(merge_user) participants << merge_user end |