Skip to content

G
gitlab-ce
Commit 27aa8b1a authored by Douwe Maan's avatar Douwe Maan
Browse files
Options

Resolve conflict in app/models/group.rb

parent 2f0d0d21
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
app/models/group.rb
View file @ 27aa8b1a
...@@ -9,12 +9,9 @@ class Group < Namespace ...@@ -9,12 +9,9 @@ class Group < Namespace
include Avatarable include Avatarable
include Referable include Referable
include SelectForProjectAuthorization include SelectForProjectAuthorization
<<<<<<< HEAD
prepend EE::GeoAwareAvatar
=======
include LoadedInGroupList include LoadedInGroupList
include GroupDescendant include GroupDescendant
>>>>>>> upstream/master prepend EE::GeoAwareAvatar
has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent has_many :group_members, -> { where(requested_at: nil) }, dependent: :destroy, as: :source # rubocop:disable Cop/ActiveRecordDependent
alias_method :members, :group_members alias_method :members, :group_members
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7