Merge branch 'fix-more-flaky-specs' into 'master'

Fix flaky specs that were only passing upon retry

See merge request gitlab-org/gitlab!36728

ee/spec/controllers/projects_controller_spec.rb

@@ -335,9 +335,9 @@ RSpec.describe ProjectsController do
           false | false | true  | true
           false | true  | true  | true
           true  | false | false | false
-          true  | true  | false | nil
+          true  | true  | false | false
           true  | false | true  | true
-          true  | true  | true  | nil
+          true  | true  | true  | true
         end
 
         with_them do
@@ -353,6 +353,7 @@ RSpec.describe ProjectsController do
                 id: project,
                 project: { setting => param_value }
               }
+
             project.reload
 
             expect(project[setting]).to eq(final_value)