diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
| commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
| tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /app/models/resource_label_event.rb | |
| parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
| download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app/models/resource_label_event.rb')
| -rw-r--r-- | app/models/resource_label_event.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/resource_label_event.rb b/app/models/resource_label_event.rb index cd47c154eef..845be408d5e 100644 --- a/app/models/resource_label_event.rb +++ b/app/models/resource_label_event.rb @@ -2,16 +2,14 @@ class ResourceLabelEvent < ResourceEvent include CacheMarkdownField + include IssueResourceEvent + include MergeRequestResourceEvent cache_markdown_field :reference - belongs_to :issue - belongs_to :merge_request belongs_to :label scope :inc_relations, -> { includes(:label, :user) } - scope :by_issue, ->(issue) { where(issue_id: issue.id) } - scope :by_merge_request, ->(merge_request) { where(merge_request_id: merge_request.id) } validates :label, presence: { unless: :importing? }, on: :create validate :exactly_one_issuable |