diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-28 09:36:32 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-28 09:36:32 +0300 |
| commit | e11473abda8f2f224f77a066691dc90744ef0925 (patch) | |
| tree | e402ec338b68a68c942be7752b5c49a2d9fa52a5 | |
| parent | 6d091758c4b17e6463a4476cab30d8bf258a3400 (diff) | |
Add latest changes from gitlab-org/gitlab@16-4-stable-ee
| -rw-r--r-- | spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb | 2 | ||||
| -rw-r--r-- | spec/support/helpers/stub_feature_flags.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb b/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb index 37075c4d2df..419196c2f42 100644 --- a/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb +++ b/spec/lib/gitlab/database/migration_helpers/restrict_gitlab_schema_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::Database::MigrationHelpers::RestrictGitlabSchema, query_analyzers: false, - stub_feature_flags: false, feature_category: :cell do + stub_feature_flags: false, use_clean_rails_redis_caching: true, feature_category: :cell do let(:schema_class) { Class.new(Gitlab::Database::Migration[1.0]).include(described_class) } # We keep only the GitlabSchemasValidateConnection analyzer running diff --git a/spec/support/helpers/stub_feature_flags.rb b/spec/support/helpers/stub_feature_flags.rb index e301e29afc2..7cebda700d3 100644 --- a/spec/support/helpers/stub_feature_flags.rb +++ b/spec/support/helpers/stub_feature_flags.rb @@ -22,6 +22,7 @@ module StubFeatureFlags def unstub_all_feature_flags Feature.stub = false + Feature.reset_flipper end # Stub Feature flags with `flag_name: true/false` |