Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-04-12 12:37:01 +0300
committerJan Provaznik <jprovaznik@gitlab.com>2018-04-12 12:55:15 +0300
commit3e831453d606a3d2eb82fddaa142f9ce52f0ac76 (patch)
tree0fcdcbd54de6d265a3d1cd7510895045bf437818 /lib/banzai
parent8e0e9d6dd5b8c283d16bd447ee052203590a391a (diff)
Fix reference filters in group context
Since !18150 abstract reference filter supports also `group` as a resource parent (not only `project`). Some reference filters, which inherit from abstract filter, depend on parent being `project` when checking a reference. This patch adds explicit check of parent class to the given filters.
Diffstat (limited to 'lib/banzai')
-rw-r--r--lib/banzai/filter/abstract_reference_filter.rb26
-rw-r--r--lib/banzai/filter/commit_range_reference_filter.rb2
-rw-r--r--lib/banzai/filter/commit_reference_filter.rb2
-rw-r--r--lib/banzai/filter/label_reference_filter.rb4
-rw-r--r--lib/banzai/filter/milestone_reference_filter.rb6
-rw-r--r--lib/banzai/filter/snippet_reference_filter.rb2
-rw-r--r--lib/banzai/reference_parser/commit_range_parser.rb2
7 files changed, 28 insertions, 16 deletions
diff --git a/lib/banzai/filter/abstract_reference_filter.rb b/lib/banzai/filter/abstract_reference_filter.rb
index a848154b2d4..60a12dca9d3 100644
--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -56,29 +56,29 @@ module Banzai
# Implement in child class
# Example: project.merge_requests.find
- def find_object(project, id)
+ def find_object(parent_object, id)
end
# Override if the link reference pattern produces a different ID (global
# ID vs internal ID, for instance) to the regular reference pattern.
- def find_object_from_link(project, id)
- find_object(project, id)
+ def find_object_from_link(parent_object, id)
+ find_object(parent_object, id)
end
# Implement in child class
# Example: project_merge_request_url
- def url_for_object(object, project)
+ def url_for_object(object, parent_object)
end
- def find_object_cached(project, id)
- cached_call(:banzai_find_object, id, path: [object_class, project.id]) do
- find_object(project, id)
+ def find_object_cached(parent_object, id)
+ cached_call(:banzai_find_object, id, path: [object_class, parent_object.id]) do
+ find_object(parent_object, id)
end
end
- def find_object_from_link_cached(project, id)
- cached_call(:banzai_find_object_from_link, id, path: [object_class, project.id]) do
- find_object_from_link(project, id)
+ def find_object_from_link_cached(parent_object, id)
+ cached_call(:banzai_find_object_from_link, id, path: [object_class, parent_object.id]) do
+ find_object_from_link(parent_object, id)
end
end
@@ -88,9 +88,9 @@ module Banzai
end
end
- def url_for_object_cached(object, project)
- cached_call(:banzai_url_for_object, object, path: [object_class, project.id]) do
- url_for_object(object, project)
+ def url_for_object_cached(object, parent_object)
+ cached_call(:banzai_url_for_object, object, path: [object_class, parent_object.id]) do
+ url_for_object(object, parent_object)
end
end
diff --git a/lib/banzai/filter/commit_range_reference_filter.rb b/lib/banzai/filter/commit_range_reference_filter.rb
index 99fa2d9d8fb..01b3b0dafb9 100644
--- a/lib/banzai/filter/commit_range_reference_filter.rb
+++ b/lib/banzai/filter/commit_range_reference_filter.rb
@@ -23,6 +23,8 @@ module Banzai
end
def find_object(project, id)
+ return unless project.is_a?(Project)
+
range = CommitRange.new(id, project)
range.valid_commits? ? range : nil
diff --git a/lib/banzai/filter/commit_reference_filter.rb b/lib/banzai/filter/commit_reference_filter.rb
index 43bf4fc6565..8cd92a1adba 100644
--- a/lib/banzai/filter/commit_reference_filter.rb
+++ b/lib/banzai/filter/commit_reference_filter.rb
@@ -17,6 +17,8 @@ module Banzai
end
def find_object(project, id)
+ return unless project.is_a?(Project)
+
if project && project.valid_repo?
# n+1: https://gitlab.com/gitlab-org/gitlab-ce/issues/43894
Gitlab::GitalyClient.allow_n_plus_1_calls { project.commit(id) }
diff --git a/lib/banzai/filter/label_reference_filter.rb b/lib/banzai/filter/label_reference_filter.rb
index 1cbada818fb..a5f38046a43 100644
--- a/lib/banzai/filter/label_reference_filter.rb
+++ b/lib/banzai/filter/label_reference_filter.rb
@@ -8,8 +8,8 @@ module Banzai
Label
end
- def find_object(project, id)
- find_labels(project).find(id)
+ def find_object(parent_object, id)
+ find_labels(parent_object).find(id)
end
def self.references_in(text, pattern = Label.reference_pattern)
diff --git a/lib/banzai/filter/milestone_reference_filter.rb b/lib/banzai/filter/milestone_reference_filter.rb
index 1a1d7dbeb3d..b144bd8cf54 100644
--- a/lib/banzai/filter/milestone_reference_filter.rb
+++ b/lib/banzai/filter/milestone_reference_filter.rb
@@ -12,10 +12,14 @@ module Banzai
# 'regular' references, we need to use the global ID to disambiguate
# between group and project milestones.
def find_object(project, id)
+ return unless project.is_a?(Project)
+
find_milestone_with_finder(project, id: id)
end
def find_object_from_link(project, iid)
+ return unless project.is_a?(Project)
+
find_milestone_with_finder(project, iid: iid)
end
@@ -40,7 +44,7 @@ module Banzai
project_path = full_project_path(namespace_ref, project_ref)
project = parent_from_ref(project_path)
- return unless project
+ return unless project && project.is_a?(Project)
milestone_params = milestone_params(milestone_id, milestone_name)
diff --git a/lib/banzai/filter/snippet_reference_filter.rb b/lib/banzai/filter/snippet_reference_filter.rb
index 134a192c22b..881e10afb9f 100644
--- a/lib/banzai/filter/snippet_reference_filter.rb
+++ b/lib/banzai/filter/snippet_reference_filter.rb
@@ -12,6 +12,8 @@ module Banzai
end
def find_object(project, id)
+ return unless project.is_a?(Project)
+
project.snippets.find_by(id: id)
end
diff --git a/lib/banzai/reference_parser/commit_range_parser.rb b/lib/banzai/reference_parser/commit_range_parser.rb
index a50e6f8ef8f..2920e886938 100644
--- a/lib/banzai/reference_parser/commit_range_parser.rb
+++ b/lib/banzai/reference_parser/commit_range_parser.rb
@@ -29,6 +29,8 @@ module Banzai
end
def find_object(project, id)
+ return unless project.is_a?(Project)
+
range = CommitRange.new(id, project)
range.valid_commits? ? range : nil