diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-04 16:19:08 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-11-17 15:10:13 -0200 |
| commit | 0c052f116c9e093936847280e833ca8985d2d94c (patch) | |
| tree | 6b8d52bd8b3ac075c7abf223571cfe14345bffc3 /lib/api/entities.rb | |
| parent | b3249bc28faecd1774558ec6f8ecc32f89c416ae (diff) | |
| download | gitlab-ce-0c052f116c9e093936847280e833ca8985d2d94c.tar.gz | |
Remove default value for `project` argument on subscribable concern
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 e7042677635..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 |