summaryrefslogtreecommitdiff
path: root/app/models/issue.rb
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-26 11:13:42 +0000
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-26 11:13:42 +0000
commitca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4 (patch)
tree2c7f9b643463a69b5010b8942eaa2e3c58fd59c9 /app/models/issue.rb
parentaf6e3e57e4c0ee861e26310c65be2e5e8547ca68 (diff)
parent52bd4b88dc557f0b3c63e82d0f2093f22b28ae9d (diff)
downloadgitlab-ce-ca6cc6014eed02b2e74bc8ffe65d3c1cc2e511b4.tar.gz
Merge branch 'master' into 'add-sentry-js-again-with-vue'
# Conflicts: # config/webpack.config.js
Diffstat (limited to 'app/models/issue.rb')
-rw-r--r--app/models/issue.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index d39ae3a6c92..305fc01f041 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -199,7 +199,7 @@ class Issue < ActiveRecord::Base
# Returns `true` if the current issue can be viewed by either a logged in User
# or an anonymous user.
def visible_to_user?(user = nil)
- return false unless project.feature_available?(:issues, user)
+ return false unless project && project.feature_available?(:issues, user)
user ? readable_by?(user) : publicly_visible?
end