summaryrefslogtreecommitdiff
path: root/lib/api/entities/label.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api/entities/label.rb')
-rw-r--r--lib/api/entities/label.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/entities/label.rb b/lib/api/entities/label.rb
index ca9a0912331..dc147f33671 100644
--- a/lib/api/entities/label.rb
+++ b/lib/api/entities/label.rb
@@ -18,7 +18,9 @@ module API
end
expose :subscribed do |label, options|
- label.subscribed?(options[:current_user], options[:parent])
+ label.subscribed?(options[:current_user]) || (
+ options[:parent].is_a?(::Project) && label.subscribed?(options[:current_user], options[:parent])
+ )
end
end
end