Merge remote-tracking branch 'upstream/master' into test-pg-mysql

* upstream/master: (43 commits)
  Update CHANGELOG.md for 9.0.1
  Support wider range of monitored environments with Prometheus
  Add changelog entry
  Don't include branch name in Knapsack report file
  Add a new `stub_mattermost_setting` stub helper to properly stub Mattermost settings
  Fixed issue boards sidebar alignment
  Fixed alignment of tooltip on card assignee
  Stops triggering board sidebar when clicking avatar
  Get rid of a third N+1 query problem
  Get rid of second N+1 query problem
  Get rid of a first N+1 query problem
  Add N+1 query problem specs for Issue and MergeRequest ReferenceFilter classes
  Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`
  Use `:empty_project` where possible in service specs
  Adds entry about kebab case props in documentation
  Fix sub-nav highlighting for `Environments` and `Jobs` pages
  spread out webpack bundles per-line to reduce conflicts in EE
  Improve UX guide on tooltips
  Correct example value variable name.
  If wget fails, remove the empty file created
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/services/labels/transfer_service_spec.rb b/spec/services/labels/transfer_service_spec.rb
index 13654a0881c..11d5f1cad5e 100644
--- a/spec/services/labels/transfer_service_spec.rb
+++ b/spec/services/labels/transfer_service_spec.rb
@@ -6,8 +6,8 @@ describe Labels::TransferService, services: true do
     let(:group_1) { create(:group) }
     let(:group_2) { create(:group) }
     let(:group_3) { create(:group) }
-    let(:project_1) { create(:project, namespace: group_2) }
-    let(:project_2) { create(:project, namespace: group_3) }
+    let(:project_1) { create(:empty_project, namespace: group_2) }
+    let(:project_2) { create(:empty_project, namespace: group_3) }
 
     let(:group_label_1) { create(:group_label, group: group_1, name: 'Group Label 1') }
     let(:group_label_2) { create(:group_label, group: group_1, name: 'Group Label 2') }