Allow project group links to be expired

1 files changed, 1 insertions, 5 deletions

diff --git a/app/models/member.rb b/app/models/member.rb
index 84bbbffe718..64e0d33fb20 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -1,6 +1,7 @@
 class Member < ActiveRecord::Base
   include Sortable
   include Importable
+  include Expirable
   include Gitlab::Access
 
   attr_accessor :raw_invite_token
@@ -31,7 +32,6 @@ class Member < ActiveRecord::Base
   scope :non_invite, -> { where(invite_token: nil) }
   scope :request, -> { where.not(requested_at: nil) }
   scope :has_access, -> { where('access_level > 0') }
-  scope :expired, -> { where('expires_at <= ?', Time.current) }
 
   scope :guests, -> { where(access_level: GUEST) }
   scope :reporters, -> { where(access_level: REPORTER) }
@@ -125,10 +125,6 @@ class Member < ActiveRecord::Base
     invite? || request?
   end
 
-  def expires?
-    expires_at.present?
-  end
-
   def accept_request
     return false unless request?