Apply to MRs

app/views/shared/empty_states/_merge_requests.html.haml

@@ -8,16 +8,19 @@
       = image_tag 'illustrations/merge_requests.svg'
   .col-12
     .text-content
-      - if has_button
+      - if has_filter_bar_param?
+        %h4.text-center
+          = _("Sorry, your filter produced no results")
+        %p
+          = _("To widen your search, change or remove filters in the filter bar above")
+      - else
         %h4
           = _("Merge requests are a place to propose changes you've made to a project and discuss those changes with others")
         %p
           = _("Interested parties can even contribute by pushing commits if they want to.")
-        .text-center
-          - if project_select_button
-            = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests'
-          - else
-            = link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link'
-      - else
-        %h4.text-center
-          = _("There are no merge requests to show")
+        - if has_button
+          .text-center
+            - if project_select_button
+              = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests'
+            - else
+              = link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link'

changelogs/unreleased/53326-improve-issues-empty-state.yml

@@ -1,5 +1,5 @@
 ---
-title: Show different empty state for filtered issues
+title: Show different empty state for filtered issues and MRs
 merge_request: 22775
 author: Heinrich Lee Yu
 type: changed

locale/gitlab.pot

@@ -6194,9 +6194,6 @@ msgstr ""
 msgid "There are no labels yet"
 msgstr ""
 
-msgid "There are no merge requests to show"
-msgstr ""
-
 msgid "There are no projects shared with this group yet"
 msgstr ""
 

spec/features/merge_request/user_sees_empty_state_spec.rb

@@ -19,12 +19,20 @@ describe 'Merge request > User sees empty state' do
   context 'if there are merge requests' do
     before do
       create(:merge_request, source_project: project)
-
-      visit project_merge_requests_path(project)
     end
 
     it 'does not show an empty state' do
+      visit project_merge_requests_path(project)
+
       expect(page).not_to have_selector('.empty-state')
     end
+
+    it 'shows empty state when filter results empty' do
+      visit project_merge_requests_path(project, milestone_title: "1.0")
+
+      expect(page).to have_selector('.empty-state')
+      expect(page).to have_content('Sorry, your filter produced no results')
+      expect(page).to have_content('To widen your search, change or remove filters in the filter bar above')
+    end
   end
 end