diff options
| author | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-25 11:00:08 +0000 |
|---|---|---|
| committer | Ben Bodenmiller <bbodenmiller@hotmail.com> | 2019-08-25 11:00:08 +0000 |
| commit | f2371a89f151da21e2d139f7cb159d611ba6fd0b (patch) | |
| tree | 5692b4b958026565e4438063a522942d9da428eb /lib/api/entities.rb | |
| parent | d90b361b7c8c1aa7faa9ef1ead40e096d4ae7e42 (diff) | |
| parent | 8112fb37544557b3f94c0a558175d5da99ef9829 (diff) | |
| download | gitlab-ce-docs-gitaly-path-fixes.tar.gz | |
Merge branch 'master' into 'docs-gitaly-path-fixes'docs-gitaly-path-fixes
# Conflicts:
# doc/administration/gitaly/index.md
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 09253ab6b0e..5e66b4e76a5 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -645,7 +645,10 @@ module API end end - expose :subscribed do |issue, options| + # Calculating the value of subscribed field triggers Markdown + # processing. We can't do that for multiple issues / merge + # requests in a single API request. + expose :subscribed, if: -> (_, options) { options.fetch(:include_subscribed, true) } do |issue, options| issue.subscribed?(options[:current_user], options[:project] || issue.project) end end |