diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-16 18:14:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-16 18:14:12 +0300 |
commit | 282e71d66029b153017dab5d33e735078c374c2e (patch) | |
tree | 95d27004aa8ec9882f184a92e617972655c025ef /app/models/merge_request.rb | |
parent | 37a0f5e2cff68f10129a1cca7874b12e42827c0b (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 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b37fe9915bb..b332d702c0a 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -116,6 +116,7 @@ class MergeRequest < ApplicationRecord has_many :draft_notes has_many :reviews, inverse_of: :merge_request + has_many :created_environments, class_name: 'Environment', foreign_key: :merge_request_id, inverse_of: :merge_request KNOWN_MERGE_PARAMS = [ :auto_merge_strategy, |