summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-17 18:50:24 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-17 18:50:24 +0000
commit3344e1e8dbcb3e53e388511a661f6769b375b748 (patch)
treef2efc14b3e509d3e9affbc6351967881bc00da8d /lib/api/entities.rb
parent726a414169e6c3219ff4fd410da3efd53fc7f912 (diff)
parent81878170a7a3bd5426f6e1241c6b73d01c8c46a6 (diff)
downloadgitlab-ce-3344e1e8dbcb3e53e388511a661f6769b375b748.tar.gz
Merge branch 'feature/subscribe-to-group-level-labels' into 'master'
Support subscribing to group labels https://gitlab.com/gitlab-org/gitlab-ce/issues/23586 See merge request !7215
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 6e370e961c4..33cb6fd3704 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -218,7 +218,7 @@ module API
expose :assignee, :author, using: Entities::UserBasic
expose :subscribed do |issue, options|
- issue.subscribed?(options[:current_user])
+ issue.subscribed?(options[:current_user], options[:project] || issue.project)
end
expose :user_notes_count
expose :upvotes, :downvotes
@@ -248,7 +248,7 @@ module API
expose :diff_head_sha, as: :sha
expose :merge_commit_sha
expose :subscribed do |merge_request, options|
- merge_request.subscribed?(options[:current_user])
+ merge_request.subscribed?(options[:current_user], options[:project])
end
expose :user_notes_count
expose :should_remove_source_branch?, as: :should_remove_source_branch
@@ -454,7 +454,7 @@ module API
end
expose :subscribed do |label, options|
- label.subscribed?(options[:current_user])
+ label.subscribed?(options[:current_user], options[:project])
end
end