diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-27 03:09:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-27 03:09:34 +0300 |
| commit | 5a80b10a845c1df6d73804090265a3da67c6acc4 (patch) | |
| tree | a0cc9c6a4e5307c37b1b7ad51c186d7351a8b788 /spec/graphql | |
| parent | a8324cd026394f672b0ae482aef0f5007fe1db8e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/graphql')
| -rw-r--r-- | spec/graphql/features/feature_flag_spec.rb | 1 | ||||
| -rw-r--r-- | spec/graphql/types/base_field_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/graphql/features/feature_flag_spec.rb b/spec/graphql/features/feature_flag_spec.rb index 30238cf9cb3..95a5bcab6f4 100644 --- a/spec/graphql/features/feature_flag_spec.rb +++ b/spec/graphql/features/feature_flag_spec.rb @@ -15,6 +15,7 @@ RSpec.describe 'Graphql Field feature flags' do before do skip_feature_flags_yaml_validation + skip_default_enabled_yaml_check end subject { result } diff --git a/spec/graphql/types/base_field_spec.rb b/spec/graphql/types/base_field_spec.rb index 54b59317b55..6388ceb358c 100644 --- a/spec/graphql/types/base_field_spec.rb +++ b/spec/graphql/types/base_field_spec.rb @@ -128,6 +128,7 @@ RSpec.describe Types::BaseField do before do skip_feature_flags_yaml_validation + skip_default_enabled_yaml_check end it 'returns false if the feature is not enabled' do |