Merge branch 'ce-to-ee-2017-05-10-template-spec-fix' into 'ce-to-ee-2017-05-10'

attempt to fix spec

See merge request !1904

spec/services/projects/propagate_service_template_spec.rb

@@ -76,9 +76,9 @@ describe Projects::PropagateServiceTemplate, services: true do
         stub_const 'Projects::PropagateServiceTemplate::BATCH_SIZE', 3
 
         project_total.times { create(:empty_project) }
-
+        
         expect { described_class.propagate(service_template) }.
-          to change { Service.count }.by(project_total + 1)
+          to change { Service.all.reload.count }.by(project_total + 1)
       end
     end