diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-06-03 17:18:50 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-06-03 17:18:50 +0000 |
| commit | 88a12332dd38a8416b18c28b3465dbd35e490a27 (patch) | |
| tree | bfd30a21079f31061271c7aeb8c8ad87d37f3855 /app/presenters | |
| parent | 57fa8c75c0b6d5b62abe099bc30832156392812e (diff) | |
| parent | 5aa08c6938f88077e6be08f1a76b66121d660af7 (diff) | |
| download | gitlab-ce-88a12332dd38a8416b18c28b3465dbd35e490a27.tar.gz | |
Merge branch 'sh-resolve-member-presenter-conflicts' into 'master'
Reconcile CE and EE differences in members/_member.html.haml
See merge request gitlab-org/gitlab-ce!29021
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 |