Commit 263849f6 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Apply to MRs

parent c3f93385
...@@ -8,16 +8,19 @@ ...@@ -8,16 +8,19 @@
= image_tag 'illustrations/merge_requests.svg' = image_tag 'illustrations/merge_requests.svg'
.col-12 .col-12
.text-content .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 %h4
= _("Merge requests are a place to propose changes you've made to a project and discuss those changes with others") = _("Merge requests are a place to propose changes you've made to a project and discuss those changes with others")
%p %p
= _("Interested parties can even contribute by pushing commits if they want to.") = _("Interested parties can even contribute by pushing commits if they want to.")
.text-center - if has_button
- if project_select_button .text-center
= render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests' - if project_select_button
- else = render 'shared/new_project_item_select', path: 'merge_requests/new', label: _('New merge request'), type: :merge_requests, with_feature_enabled: 'merge_requests'
= link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link' - else
- else = link_to _('New merge request'), button_path, class: 'btn btn-success', title: _('New merge request'), id: 'new_merge_request_link'
%h4.text-center
= _("There are no merge requests to show")
--- ---
title: Show different empty state for filtered issues title: Show different empty state for filtered issues and MRs
merge_request: 22775 merge_request: 22775
author: Heinrich Lee Yu author: Heinrich Lee Yu
type: changed type: changed
...@@ -6194,9 +6194,6 @@ msgstr "" ...@@ -6194,9 +6194,6 @@ msgstr ""
msgid "There are no labels yet" msgid "There are no labels yet"
msgstr "" msgstr ""
msgid "There are no merge requests to show"
msgstr ""
msgid "There are no projects shared with this group yet" msgid "There are no projects shared with this group yet"
msgstr "" msgstr ""
......
...@@ -19,12 +19,20 @@ describe 'Merge request > User sees empty state' do ...@@ -19,12 +19,20 @@ describe 'Merge request > User sees empty state' do
context 'if there are merge requests' do context 'if there are merge requests' do
before do before do
create(:merge_request, source_project: project) create(:merge_request, source_project: project)
visit project_merge_requests_path(project)
end end
it 'does not show an empty state' do it 'does not show an empty state' do
visit project_merge_requests_path(project)
expect(page).not_to have_selector('.empty-state') expect(page).not_to have_selector('.empty-state')
end 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
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment