From 10d4625ed3b73f73bc67bf7d35347dcd1912cf7b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 3 Oct 2022 09:09:43 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/concerns/users/participable_service.rb | 2 ++ app/services/projects/autocomplete_service.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'app/services') diff --git a/app/services/concerns/users/participable_service.rb b/app/services/concerns/users/participable_service.rb index c1c93aa604e..281b2508090 100644 --- a/app/services/concerns/users/participable_service.rb +++ b/app/services/concerns/users/participable_service.rb @@ -32,6 +32,8 @@ module Users end def groups + return [] unless current_user + current_user.authorized_groups.with_route.sort_by(&:path) end diff --git a/app/services/projects/autocomplete_service.rb b/app/services/projects/autocomplete_service.rb index e6b1b33a82a..4b4981fde99 100644 --- a/app/services/projects/autocomplete_service.rb +++ b/app/services/projects/autocomplete_service.rb @@ -24,7 +24,7 @@ module Projects end def commands(noteable, type) - return [] unless noteable + return [] unless noteable && current_user QuickActions::InterpretService.new(project, current_user).available_commands(noteable) end -- cgit v1.2.1