Merge branch 'master' into 33466-jobs-navigation-menu33466-jobs-navigation-menu

* master:
  Clarify API V5 being a compatability layer on top of GraphQL
  Update per discussion
  Use RequestStore on MR show.json query count spec
  Merge branch '25934-project-snippet-vis' into 'security-9-2'
  Merge branch 'dz-api-x-frame' into 'security-9-2'
  Merge branch 'dz-restrict-autocomplete' into 'security-9-1'
  Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'
  Update rename_system_namespace_spec to new validations.
  Make the uploader use the updated folder
  Bring in security changes from the 9.2.5 release
  Bring in security changes from the 9.2.5 release
  GitLab GEO also does not support mysql replication

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index 0e74f1ab1bd..145c7ad5770 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -43,6 +43,12 @@ describe Namespace, models: true do
         end
       end
 
+      context "is case insensitive" do
+        let(:group) { build(:group, path: "System") }
+
+        it { expect(group).not_to be_valid }
+      end
+
       context 'top-level group' do
         let(:group) { build(:group, path: 'tree') }
 
@@ -178,8 +184,8 @@ describe Namespace, models: true do
       let(:parent) { create(:group, name: 'parent', path: 'parent') }
       let(:child) { create(:group, name: 'child', path: 'child', parent: parent) }
       let!(:project) { create(:project_empty_repo, path: 'the-project', namespace: child) }
-      let(:uploads_dir) { File.join(CarrierWave.root, 'uploads') }
-      let(:pages_dir) { TestEnv.pages_path }
+      let(:uploads_dir) { File.join(CarrierWave.root, FileUploader.base_dir) }
+      let(:pages_dir) { File.join(TestEnv.pages_path) }
 
       before do
         FileUtils.mkdir_p(File.join(uploads_dir, 'parent', 'child', 'the-project'))