summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/changeset.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 86fc144ac..1faad1d35 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -185,7 +185,7 @@ class Changeset < ActiveRecord::Base
return nil if id.blank?
issue = Issue.find_by_id(id.to_i, :include => :project)
if issue
- unless project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)
+ unless issue.project && (project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project))
issue = nil
end
end