diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 03:09:05 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-24 03:09:05 +0000 |
commit | 07d0374b204881f2bd64ed897e4bbab19f180cc9 (patch) | |
tree | ed7837a31c0edae5e8ec876626b0bf3ecb3db68c /lib/banzai | |
parent | 2ed3b0abccc8de391f1a9de2bc5785d3e0f5b018 (diff) | |
download | gitlab-ce-07d0374b204881f2bd64ed897e4bbab19f180cc9.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/banzai')
-rw-r--r-- | lib/banzai/filter/issuable_state_filter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/issuable_state_filter.rb b/lib/banzai/filter/issuable_state_filter.rb index f9d8bf8a1fa..a88629ac105 100644 --- a/lib/banzai/filter/issuable_state_filter.rb +++ b/lib/banzai/filter/issuable_state_filter.rb @@ -18,7 +18,7 @@ module Banzai issuables = extractor.extract([doc]) issuables.each do |node, issuable| - next if !can_read_cross_project? && cross_reference?(issuable) + next if !can_read_cross_project? && cross_referenced?(issuable) if VISIBLE_STATES.include?(issuable.state) && issuable_reference?(node.inner_html, issuable) state = moved_issue?(issuable) ? s_("IssuableStatus|moved") : issuable.state @@ -39,7 +39,7 @@ module Banzai CGI.unescapeHTML(text) == issuable.reference_link_text(project || group) end - def cross_reference?(issuable) + def cross_referenced?(issuable) return true if issuable.project != project return true if issuable.respond_to?(:group) && issuable.group != group |