diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-11-18 20:20:30 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-11-18 20:20:30 +0100 |
| commit | 8d0018444db47b38d1efbd5589d0b147740d4bc3 (patch) | |
| tree | 09eaa4fac817c623a3019b951fffc767d53d13ec /app/models/issue.rb | |
| parent | 73a5f331b2e7b2e224147e69c857c6306318399e (diff) | |
| parent | 596c305eab94dfacb302c3630f08d81636623d64 (diff) | |
| download | gitlab-ce-8d0018444db47b38d1efbd5589d0b147740d4bc3.tar.gz | |
Merge remote-tracking branch 'origin/master' into 22539-display-folders
Diffstat (limited to 'app/models/issue.rb')
| -rw-r--r-- | app/models/issue.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb index 4a4017003d8..6e8f5d3c422 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -266,7 +266,7 @@ class Issue < ActiveRecord::Base def as_json(options = {}) super(options).tap do |json| - json[:subscribed] = subscribed?(options[:user]) if options.has_key?(:user) && options[:user] + json[:subscribed] = subscribed?(options[:user], project) if options.has_key?(:user) && options[:user] if options.has_key?(:labels) json[:labels] = labels.as_json( |