Merge branch 'revert-6455-and-4960' into 'master'

Revert the "accurate issuable counts in issuable list" feature

## Why was this MR needed?

!6455 introduced a performance killer, so we revert it until we find a proper solution that's not killing performance.

## What are the relevant issue numbers?

Revert !6455 and !4960.

See merge request !6476

3 files changed, 7 insertions, 54 deletions

diff --git a/spec/features/dashboard_issues_spec.rb b/spec/features/dashboard_issues_spec.rb
index fc914022a59..3fb1cb37544 100644
--- a/spec/features/dashboard_issues_spec.rb
+++ b/spec/features/dashboard_issues_spec.rb
@@ -21,9 +21,6 @@ describe "Dashboard Issues filtering", feature: true, js: true do
 
       click_link 'No Milestone'
 
-      page.within '.issues-state-filters' do
-        expect(page).to have_selector('.active .badge', text: '1')
-      end
       expect(page).to have_selector('.issue', count: 1)
     end
 
@@ -32,9 +29,6 @@ describe "Dashboard Issues filtering", feature: true, js: true do
 
       click_link 'Any Milestone'
 
-      page.within '.issues-state-filters' do
-        expect(page).to have_selector('.active .badge', text: '2')
-      end
       expect(page).to have_selector('.issue', count: 2)
     end
 
@@ -45,9 +39,6 @@ describe "Dashboard Issues filtering", feature: true, js: true do
         click_link milestone.title
       end
 
-      page.within '.issues-state-filters' do
-        expect(page).to have_selector('.active .badge', text: '1')
-      end
       expect(page).to have_selector('.issue', count: 1)
     end
   end
diff --git a/spec/features/issues/filter_by_labels_spec.rb b/spec/features/issues/filter_by_labels_spec.rb
index 7e2abd759e1..908b18e5339 100644
--- a/spec/features/issues/filter_by_labels_spec.rb
+++ b/spec/features/issues/filter_by_labels_spec.rb
@@ -6,19 +6,20 @@ feature 'Issue filtering by Labels', feature: true do
   let(:project) { create(:project, :public) }
   let!(:user)   { create(:user)}
   let!(:label)  { create(:label, project: project) }
-  let(:bug) { create(:label, project: project, title: 'bug') }
-  let(:feature) { create(:label, project: project, title: 'feature') }
-  let(:enhancement) { create(:label, project: project, title: 'enhancement') }
-  let(:issue1) { create(:issue, title: "Bugfix1", project: project) }
-  let(:issue2) { create(:issue, title: "Bugfix2", project: project) }
-  let(:issue3) { create(:issue, title: "Feature1", project: project) }
 
   before do
+    bug = create(:label, project: project, title: 'bug')
+    feature = create(:label, project: project, title: 'feature')
+    enhancement = create(:label, project: project, title: 'enhancement')
+
+    issue1 = create(:issue, title: "Bugfix1", project: project)
     issue1.labels << bug
 
+    issue2 = create(:issue, title: "Bugfix2", project: project)
     issue2.labels << bug
     issue2.labels << enhancement
 
+    issue3 = create(:issue, title: "Feature1", project: project)
     issue3.labels << feature
 
     project.team << [user, :master]
@@ -158,13 +159,6 @@ feature 'Issue filtering by Labels', feature: true do
       wait_for_ajax
     end
 
-    it 'shows a correct "Open" counter' do
-      page.within '.issues-state-filters' do
-        expect(page).not_to have_content "{#{issue2.id} => 1}"
-        expect(page).to have_content "Open 1"
-      end
-    end
-
     it 'shows issue "Bugfix2" in issues list' do
       expect(page).to have_content "Bugfix2"
     end
diff --git a/spec/features/issues/filter_issues_spec.rb b/spec/features/issues/filter_issues_spec.rb
index 72f39e2fbca..d1501c9791a 100644
--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
@@ -230,10 +230,6 @@ describe 'Filter issues', feature: true do
           expect(page).to have_selector('.issue', count: 2)
         end
 
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '2')
-        end
-
         click_button 'Label'
         page.within '.labels-filter' do
           click_link 'bug'
@@ -243,10 +239,6 @@ describe 'Filter issues', feature: true do
         page.within '.issues-list' do
           expect(page).to have_selector('.issue', count: 1)
         end
-
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '1')
-        end
       end
 
       it 'filters by text and milestone' do
@@ -256,10 +248,6 @@ describe 'Filter issues', feature: true do
           expect(page).to have_selector('.issue', count: 2)
         end
 
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '2')
-        end
-
         click_button 'Milestone'
         page.within '.milestone-filter' do
           click_link '8'
@@ -268,10 +256,6 @@ describe 'Filter issues', feature: true do
         page.within '.issues-list' do
           expect(page).to have_selector('.issue', count: 1)
         end
-
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '1')
-        end
       end
 
       it 'filters by text and assignee' do
@@ -281,10 +265,6 @@ describe 'Filter issues', feature: true do
           expect(page).to have_selector('.issue', count: 2)
         end
 
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '2')
-        end
-
         click_button 'Assignee'
         page.within '.dropdown-menu-assignee' do
           click_link user.name
@@ -293,10 +273,6 @@ describe 'Filter issues', feature: true do
         page.within '.issues-list' do
           expect(page).to have_selector('.issue', count: 1)
         end
-
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '1')
-        end
       end
 
       it 'filters by text and author' do
@@ -306,10 +282,6 @@ describe 'Filter issues', feature: true do
           expect(page).to have_selector('.issue', count: 2)
         end
 
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '2')
-        end
-
         click_button 'Author'
         page.within '.dropdown-menu-author' do
           click_link user.name
@@ -318,10 +290,6 @@ describe 'Filter issues', feature: true do
         page.within '.issues-list' do
           expect(page).to have_selector('.issue', count: 1)
         end
-
-        page.within '.issues-state-filters' do
-          expect(page).to have_selector('.active .badge', text: '1')
-        end
       end
     end
   end