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:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-17 03:08:16 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-17 03:08:16 +0300
commit6399bb0f03e60ee2220ae668bbc6682cbb346eee (patch)
tree2cc7a868ea5ea765a864a6e2e960d1e06fc36ad5 /app/finders
parentaf11eb63cf4eaab8801416cc4a65f0bd4fad8817 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/finders')
-rw-r--r--app/finders/ci/pipelines_finder.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/finders/ci/pipelines_finder.rb b/app/finders/ci/pipelines_finder.rb
index 8fd69a32ae9..4c47517299a 100644
--- a/app/finders/ci/pipelines_finder.rb
+++ b/app/finders/ci/pipelines_finder.rb
@@ -154,7 +154,10 @@ module Ci
end
def by_name(items)
- return items unless Feature.enabled?(:pipeline_name, project) && params[:name].present?
+ return items unless
+ Feature.enabled?(:pipeline_name, project) &&
+ Feature.enabled?(:pipeline_name_search, project) &&
+ params[:name].present?
items.for_name(params[:name])
end