summaryrefslogtreecommitdiff
path: root/app/models/event.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-11-16 15:17:09 +0100
committerRémy Coutable <remy@rymai.me>2016-11-16 15:35:15 +0100
commitd47fca53db5840e85d38b35058d4bbd94ea917db (patch)
treeede2db2153f40e4b929a65d166206b369c45a90f /app/models/event.rb
parent1263708d81dcb978b44139a2965d384dff310fcc (diff)
downloadgitlab-ce-d47fca53db5840e85d38b35058d4bbd94ea917db.tar.gz
Allow commit note to be visible if repo is visible23824-activity-page-does-not-show-commits-comments
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/event.rb')
-rw-r--r--app/models/event.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/event.rb b/app/models/event.rb
index c76d88b1c7b..21eaca917b8 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -62,7 +62,7 @@ class Event < ActiveRecord::Base
end
def visible_to_user?(user = nil)
- if push?
+ if push? || commit_note?
Ability.allowed?(user, :download_code, project)
elsif membership_changed?
true
@@ -283,7 +283,7 @@ class Event < ActiveRecord::Base
end
def commit_note?
- target.for_commit?
+ note? && target && target.for_commit?
end
def issue_note?
@@ -295,7 +295,7 @@ class Event < ActiveRecord::Base
end
def project_snippet_note?
- target.for_snippet?
+ note? && target && target.for_snippet?
end
def note_target