diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-01 22:19:22 -0700 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-01 22:19:22 -0700 |
commit | 5aa08c6938f88077e6be08f1a76b66121d660af7 (patch) | |
tree | e13df16bccfdd0d1903105d8ba9a0dc94827c74c /app/presenters | |
parent | 2ad5b30b6c02a3e3f84275121a709f5de75dac48 (diff) | |
download | gitlab-ce-5aa08c6938f88077e6be08f1a76b66121d660af7.tar.gz |
Reconcile CE and EE differences in members/_member.html.hamlsh-resolve-member-presenter-conflicts
This file conflicts quite frequently with any changes in the file.
Diffstat (limited to 'app/presenters')
-rw-r--r-- | app/presenters/member_presenter.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/presenters/member_presenter.rb b/app/presenters/member_presenter.rb index 9e9b6973b8e..2561c3f0244 100644 --- a/app/presenters/member_presenter.rb +++ b/app/presenters/member_presenter.rb @@ -32,6 +32,11 @@ class MemberPresenter < Gitlab::View::Presenter::Delegated request? && can_update? end + # This functionality is only available in EE. + def can_override? + false + end + private def admin_member_permission |