From 3b85f5e4a123538b14eb052ae0efb9d7dbcd4e9b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 16 Sep 2021 09:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/concerns/issuable_collections.rb | 2 +- app/controllers/explore/projects_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index fe793a1116f..4841225de08 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -16,7 +16,7 @@ module IssuableCollections def show_alert_if_search_is_disabled return if current_user || params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_search, type: :ops) - flash[:notice] = _('You must sign in to search for specific terms.') + flash.now[:notice] = _('You must sign in to search for specific terms.') end # rubocop:disable Gitlab/ModuleWithInstanceVariables diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb index 92ff3ffb8ff..3dc6a16cbc1 100644 --- a/app/controllers/explore/projects_controller.rb +++ b/app/controllers/explore/projects_controller.rb @@ -125,7 +125,7 @@ class Explore::ProjectsController < Explore::ApplicationController def show_alert_if_search_is_disabled return if current_user || params[:name].blank? && params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_project_search, type: :ops) - flash[:notice] = _('You must sign in to search for specific projects.') + flash.now[:notice] = _('You must sign in to search for specific projects.') end end -- cgit v1.2.3