Revert "Merge branch 'sidebar-cache-updates' into 'master'"

This reverts commit dd406182cb3529c3616097703b7d4dec49a3cb39, reversing
changes made to d5d249764350b07340ed45068361d7249b3cf641.

5 files changed, 0 insertions, 56 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 30dc62c6c40..cc8289b78b0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -269,13 +269,7 @@ class Issue < ActiveRecord::Base
     end
   end
 
-  def update_project_counter_caches?
-    state_changed? || confidential_changed?
-  end
-
   def update_project_counter_caches
-    return unless update_project_counter_caches?
-
     Projects::OpenIssuesCountService.new(project).refresh_cache
   end
 
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 4dd9d5124b5..1f5e8affdec 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -942,13 +942,7 @@ class MergeRequest < ActiveRecord::Base
     true
   end
 
-  def update_project_counter_caches?
-    state_changed?
-  end
-
   def update_project_counter_caches
-    return unless update_project_counter_caches?
-
     Projects::OpenMergeRequestsCountService.new(target_project).refresh_cache
   end
 
diff --git a/changelogs/unreleased/sidebar-cache-updates.yml b/changelogs/unreleased/sidebar-cache-updates.yml
deleted file mode 100644
index aebe53ba5b2..00000000000
--- a/changelogs/unreleased/sidebar-cache-updates.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Only update the sidebar count caches when needed
-merge_request:
-author:
-type: other
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 940d614bdcb..f8964f880e8 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -773,22 +773,4 @@ describe Issue do
       expect(described_class.public_only).to eq([public_issue])
     end
   end
-
-  describe '#update_project_counter_caches?' do
-    it 'returns true when the state changes' do
-      subject.state = 'closed'
-
-      expect(subject.update_project_counter_caches?).to eq(true)
-    end
-
-    it 'returns true when the confidential flag changes' do
-      subject.confidential = true
-
-      expect(subject.update_project_counter_caches?).to eq(true)
-    end
-
-    it 'returns false when the state or confidential flag did not change' do
-      expect(subject.update_project_counter_caches?).to eq(false)
-    end
-  end
 end
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 7edceba2bda..5baa7c81ecc 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -1694,25 +1694,4 @@ describe MergeRequest do
       expect(subject.ref_fetched?).to be_falsey
     end
   end
-
-  describe 'removing a merge request' do
-    it 'refreshes the number of open merge requests of the target project' do
-      project = subject.target_project
-
-      expect { subject.destroy }
-        .to change { project.open_merge_requests_count }.from(1).to(0)
-    end
-  end
-
-  describe '#update_project_counter_caches?' do
-    it 'returns true when the state changes' do
-      subject.state = 'closed'
-
-      expect(subject.update_project_counter_caches?).to eq(true)
-    end
-
-    it 'returns false when the state did not change' do
-      expect(subject.update_project_counter_caches?).to eq(false)
-    end
-  end
 end