diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 15:44:42 +0000 |
commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
tree | 5423a1c7516cffe36384133ade12572cf709398d /app/models/timelog.rb | |
parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
download | gitlab-ce-4555e1b21c365ed8303ffb7a3325d773c9b8bf31.tar.gz |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'app/models/timelog.rb')
-rw-r--r-- | app/models/timelog.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/models/timelog.rb b/app/models/timelog.rb index c1aa84cbbcd..bd543526685 100644 --- a/app/models/timelog.rb +++ b/app/models/timelog.rb @@ -3,20 +3,19 @@ class Timelog < ApplicationRecord include Importable + before_save :set_project + validates :time_spent, :user, presence: true validate :issuable_id_is_present, unless: :importing? belongs_to :issue, touch: true belongs_to :merge_request, touch: true + belongs_to :project belongs_to :user belongs_to :note - scope :for_issues_in_group, -> (group) do - joins(:issue).where( - 'EXISTS (?)', - Project.select(1).where(namespace: group.self_and_descendants) - .where('issues.project_id = projects.id') - ) + scope :in_group, -> (group) do + joins(:project).where(projects: { namespace: group.self_and_descendants }) end scope :between_times, -> (start_time, end_time) do @@ -37,6 +36,10 @@ class Timelog < ApplicationRecord end end + def set_project + self.project_id = issuable.project_id + end + # Rails5 defaults to :touch_later, overwrite for normal touch def belongs_to_touch_method :touch |