diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-08-20 12:58:03 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-08-20 12:58:03 +0000 |
| commit | 57ec78d53066cf9184859a0202609eb01567eab9 (patch) | |
| tree | 0fec8bd0238520e11cb226f118ab6590e29f44fb /lib | |
| parent | 9e6a8bb93b6fbcbe5657079108332b99fc8749cc (diff) | |
| parent | ba7c501fef5976ea7a1cc4212e84742246fed781 (diff) | |
| download | gitlab-ce-57ec78d53066cf9184859a0202609eb01567eab9.tar.gz | |
Merge branch 'sh-fix-issues-api-gitaly-nplusone' into 'master'
Fix Gitaly N+1 calls with listing issues/MRs via API
Closes #66202
See merge request gitlab-org/gitlab-ce!31938
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 5 | ||||
| -rw-r--r-- | lib/api/issues.rb | 6 |
2 files changed, 8 insertions, 3 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 diff --git a/lib/api/issues.rb b/lib/api/issues.rb index d687acf3423..7819c2de515 100644 --- a/lib/api/issues.rb +++ b/lib/api/issues.rb @@ -96,7 +96,8 @@ module API with: Entities::Issue, with_labels_details: declared_params[:with_labels_details], current_user: current_user, - issuable_metadata: issuable_meta_data(issues, 'Issue', current_user) + issuable_metadata: issuable_meta_data(issues, 'Issue', current_user), + include_subscribed: false } present issues, options @@ -122,7 +123,8 @@ module API with: Entities::Issue, with_labels_details: declared_params[:with_labels_details], current_user: current_user, - issuable_metadata: issuable_meta_data(issues, 'Issue', current_user) + issuable_metadata: issuable_meta_data(issues, 'Issue', current_user), + include_subscribed: false } present issues, options |