Merge branch '8834-fix-roadmap-epic-states-path' into 'master'

Resolve "Changing epics state dropdown removes label filter incorrectly"

Closes #8834

See merge request gitlab-org/gitlab-ee!8835

ee/app/helpers/epics_helper.rb

@@ -79,7 +79,7 @@ module EpicsHelper
   end
 
   def epic_state_dropdown_link(state, selected_state)
-    link_to epic_state_title(state), page_filter_path(state: state), class: state == selected_state ? 'is-active' : ''
+    link_to epic_state_title(state), page_filter_path(state: state, label: true), class: state == selected_state ? 'is-active' : ''
   end
 
   def epic_state_title(state)

ee/spec/features/groups/group_roadmap_spec.rb

@@ -126,6 +126,16 @@ describe 'group epic roadmap', :js do
           expect(page).to have_content(epic_with_bug.title)
         end
       end
+
+      it 'keeps label filter when filtering by state' do
+        state_dropdown.find('.dropdown-toggle').click
+        state_dropdown.find('a', text: 'Open epics').click
+
+        page.within('.roadmap-container .epics-list-section') do
+          expect(page).to have_selector('.epics-list-item .epic-title', count: 1)
+          expect(page).to have_content(epic_with_bug.title)
+        end
+      end
     end
   end