summaryrefslogtreecommitdiff
path: root/app/presenters/user_presenter.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-20 23:50:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-20 23:50:22 +0000
commit9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch)
tree70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/presenters/user_presenter.rb
parent4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff)
downloadgitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/presenters/user_presenter.rb')
-rw-r--r--app/presenters/user_presenter.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb
index 0028e6d9ef0..7cd94082bac 100644
--- a/app/presenters/user_presenter.rb
+++ b/app/presenters/user_presenter.rb
@@ -13,7 +13,11 @@ class UserPresenter < Gitlab::View::Presenter::Delegated
private
+ def can?(*args)
+ user.can?(*args)
+ end
+
def should_be_private?
- !can?(current_user, :read_user_profile, user)
+ !Ability.allowed?(current_user, :read_user_profile, user)
end
end