diff options
| author | Timothy Andrew <mail@timothyandrew.net> | 2016-05-11 09:52:58 +0530 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2016-05-11 09:52:58 +0530 |
| commit | 2e9742997ddbfaeff350eb5334b7f641a779550c (patch) | |
| tree | 4dacf94eb6b6f67fc5c8b89b117f0babe1c2b8a4 /lib/api/entities.rb | |
| parent | 2768e99ac386598480a7ac5490deee644125dfa1 (diff) | |
| parent | f7d2297c86eb84c2e2fbfa6b3e007da3c7adb5ae (diff) | |
| download | gitlab-ce-2e9742997ddbfaeff350eb5334b7f641a779550c.tar.gz | |
Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokens
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 4 |
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 |