diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
| commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
| tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/models/deployment_merge_request.rb | |
| parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
| download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/models/deployment_merge_request.rb')
| -rw-r--r-- | app/models/deployment_merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/deployment_merge_request.rb b/app/models/deployment_merge_request.rb index 64a578e16bf..7949bd81605 100644 --- a/app/models/deployment_merge_request.rb +++ b/app/models/deployment_merge_request.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class DeploymentMergeRequest < ApplicationRecord + extend SuppressCompositePrimaryKeyWarning + belongs_to :deployment, optional: false belongs_to :merge_request, optional: false |