diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /app/models/timelog.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'app/models/timelog.rb')
-rw-r--r-- | app/models/timelog.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/timelog.rb b/app/models/timelog.rb index c0aac6f27aa..60aaaaef831 100644 --- a/app/models/timelog.rb +++ b/app/models/timelog.rb @@ -7,6 +7,7 @@ class Timelog < ApplicationRecord belongs_to :issue, touch: true belongs_to :merge_request, touch: true belongs_to :user + belongs_to :note scope :for_issues_in_group, -> (group) do joins(:issue).where( |