summaryrefslogtreecommitdiff
path: root/lib/api
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-12-03 09:59:43 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-12-03 09:59:43 +0000
commit6aefeb24873b0957456ae0deacbb431fc79a6a28 (patch)
treea803343e837f64c2d214a01098fa989097e203cb /lib/api
parent9d9ee598bc514eaee681b40cdff4d12a3a8f412a (diff)
downloadgitlab-ce-6aefeb24873b0957456ae0deacbb431fc79a6a28.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-5-stable-ee
Diffstat (limited to 'lib/api')
-rw-r--r--lib/api/entities/project.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/entities/project.rb b/lib/api/entities/project.rb
index e3f1e90b80f..662ca59852e 100644
--- a/lib/api/entities/project.rb
+++ b/lib/api/entities/project.rb
@@ -55,7 +55,9 @@ module API
expose(:snippets_enabled) { |project, options| project.feature_available?(:snippets, options[:current_user]) }
expose(:container_registry_enabled) { |project, options| project.feature_available?(:container_registry, options[:current_user]) }
expose :service_desk_enabled
- expose :service_desk_address
+ expose :service_desk_address, if: -> (project, options) do
+ Ability.allowed?(options[:current_user], :admin_issue, project)
+ end
expose(:can_create_merge_request_in) do |project, options|
Ability.allowed?(options[:current_user], :create_merge_request_in, project)