summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-05-09 14:53:13 +0000
committerRémy Coutable <remy@rymai.me>2016-05-09 14:53:13 +0000
commit8dd2188b8367ad18bf005c855ef55f001a0b5fd1 (patch)
treea909599a09100b4f830f9560a3949a381a96ba47 /lib
parentd4d34b161b41539567332d45527bb10c9f0665e3 (diff)
parentf5240f9703fea9902ac4304b8e12daed5c21820d (diff)
downloadgitlab-ce-8dd2188b8367ad18bf005c855ef55f001a0b5fd1.tar.gz
Merge branch '2954-api-expose-issue-user_notes_count' into 'master'
API: Expose Issue#user_notes_count and MergeRequest#user_notes_count _Originally opened at !2954 by @cnam812._ - - - Expose `Issue#user_notes_count` and `MergeRequest#user_notes_count` through the API. See merge request !3126
Diffstat (limited to 'lib')
-rw-r--r--lib/api/entities.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 716ca6f7ed9..2870a6a40ef 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -170,10 +170,10 @@ module API
expose :label_names, as: :labels
expose :milestone, using: Entities::Milestone
expose :assignee, :author, using: Entities::UserBasic
-
expose :subscribed do |issue, options|
issue.subscribed?(options[:current_user])
end
+ expose :user_notes_count
end
class MergeRequest < ProjectEntity
@@ -187,10 +187,10 @@ module API
expose :milestone, using: Entities::Milestone
expose :merge_when_build_succeeds
expose :merge_status
-
expose :subscribed do |merge_request, options|
merge_request.subscribed?(options[:current_user])
end
+ expose :user_notes_count
end
class MergeRequestChanges < MergeRequest