Merge branch 'master' into issue-discussions-refactor

# Conflicts:
#	app/models/issue.rb

1 files changed, 7 insertions, 0 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 4cd30dfeb94..5820e57e531 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -50,7 +50,10 @@ class Issue < ActiveRecord::Base
 
   scope :preload_associations, -> { preload(:labels, project: :namespace) }
 
+  scope :public_only, -> { where(confidential: false) }
+
   after_save :expire_etag_cache
+  after_commit :update_project_counter_caches, on: :destroy
 
   attr_spammable :title, spam_title: true
   attr_spammable :description, spam_description: true
@@ -270,6 +273,10 @@ class Issue < ActiveRecord::Base
     true
   end
 
+  def update_project_counter_caches
+    Projects::OpenIssuesCountService.new(project).refresh_cache
+  end
+
   private
 
   # Returns `true` if the given User can read the current Issue.