diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-29 18:58:31 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-29 18:58:31 +0300 |
| commit | b0f939a79fe16ff760d6e589c8f9cd71c0fa1da7 (patch) | |
| tree | 0b41b378794f136d1b7855b327fdb555dbe1eec5 /app/models | |
| parent | 8d0b026ac70cbb52afbf0d61b88925c5d1d33d94 (diff) | |
| parent | 506bf4281795d5d05c80b0bef59511120dbc8d81 (diff) | |
Merge branch 'security-ag-hide-private-members-in-project-member-autocomplete' into 'master'
Hide private members in project member autocomplete
See merge request gitlab/gitlabhq!3212
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/member.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index e2d26773d45..2654453cf3f 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -8,6 +8,7 @@ class Member < ApplicationRecord include Gitlab::Access include Presentable include Gitlab::Utils::StrongMemoize + include FromUnion attr_accessor :raw_invite_token |