Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 1 deletions

diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index 656e4fdaefb..fc7865c949d 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -456,7 +456,7 @@ class Projects::IssuesController < Projects::ApplicationController
   def redirect_if_work_item
     return unless use_work_items_path?(issue)
 
-    redirect_to project_work_items_path(project, issue.iid, params: request.query_parameters)
+    redirect_to project_work_item_path(project, issue.iid, params: request.query_parameters)
   end
 
   def require_incident_for_incident_routes
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index d247490402f..3f44aef3eda 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -35,6 +35,26 @@ class SearchController < ApplicationController
     update_scope_for_code_search
   end
 
+  before_action only: :show do
+    push_frontend_feature_flag(:search_notes_hide_archived_projects, current_user)
+  end
+
+  before_action only: :show do
+    push_frontend_feature_flag(:search_issues_hide_archived_projects, current_user)
+  end
+
+  before_action only: :show do
+    push_frontend_feature_flag(:search_merge_requests_hide_archived_projects, current_user)
+  end
+
+  before_action only: :show do
+    push_frontend_feature_flag(:search_commits_hide_archived_projects, current_user)
+  end
+
+  before_action only: :show do
+    push_frontend_feature_flag(:search_milestones_hide_archived_projects, current_user)
+  end
+
   rescue_from ActiveRecord::QueryCanceled, with: :render_timeout
 
   layout 'search'