Merge branch 'patch-35' into 'master'

Make 404 page button same height as text input

See merge request gitlab-org/gitlab!19080

app/views/errors/not_found.html.haml

@@ -11,5 +11,5 @@
     = form_tag search_path, method: :get, class: 'form-inline-flex' do |f|
       .field
         = search_field_tag :search, '', placeholder: _('Search for projects, issues, etc.'), class: 'form-control'
-      = button_tag 'Search', class: 'btn btn-success', name: nil, type: 'submit'
+      = button_tag _('Search'), class: 'btn btn-sm btn-success', name: nil, type: 'submit'
 = render 'errors/footer'

changelogs/unreleased/patch-35.yml

+---
+title: Fix search button height on 404 page
+merge_request: 19080
+author:
+type: fixed