From 15b34520549c1f67bd92469003fe5a9260e34e43 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 28 Sep 2020 09:09:35 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/models/member.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/models/member.rb') diff --git a/app/models/member.rb b/app/models/member.rb index 0f9950b6e42..7c9586aef76 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -78,7 +78,10 @@ class Member < ApplicationRecord scope :request, -> { where.not(requested_at: nil) } scope :non_request, -> { where(requested_at: nil) } - scope :not_accepted_invitations_by_user, -> (user) { invite.where(invite_accepted_at: nil, created_by: user) } + scope :not_accepted_invitations, -> { invite.where(invite_accepted_at: nil) } + scope :not_accepted_invitations_by_user, -> (user) { not_accepted_invitations.where(created_by: user) } + scope :not_expired, -> (today = Date.current) { where(arel_table[:expires_at].gt(today).or(arel_table[:expires_at].eq(nil))) } + scope :last_ten_days_excluding_today, -> (today = Date.current) { where(created_at: (today - 10).beginning_of_day..(today - 1).end_of_day) } scope :has_access, -> { active.where('access_level > 0') } -- cgit v1.2.3