Merge branch 'rs-fix-master' into 'master'

app/helpers/issuables_helper.rb

@@ -242,7 +242,7 @@ module IssuablesHelper
 
   def issuables_count_for_state(issuable_type, state)
     finder = public_send("#{issuable_type}_finder") # rubocop:disable GitlabSecurity/PublicSend
-    finder.count_by_state
+    finder.count_by_state[state]
   end
 
   def close_issuable_url(issuable)

spec/services/issues/update_service_spec.rb

@@ -519,7 +519,7 @@ describe Issues::UpdateService, :mailer do
         end
 
         it 'calls the move service with the proper issue and project' do
-          move_stub = class_double("Issues::MoveService").as_stubbed_const
+          move_stub = instance_double(Issues::MoveService)
           allow(Issues::MoveService).to receive(:new).and_return(move_stub)
           allow(move_stub).to receive(:execute).with(issue, target_project).and_return(issue)