diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2019-04-19 10:03:54 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2019-04-19 10:03:54 +0000 |
| commit | 4d2bce770bdf1b12378d3c06f895cc73d46d6f9f (patch) | |
| tree | 923cf5f33e3d69c57c718579f14797b4efcc98de /spec/graphql/gitlab_schema_spec.rb | |
| parent | fe1407b1fba62b14862613de563857f339e3c31b (diff) | |
| parent | eca8e6f09b1800b58904582b527103b5c755e898 (diff) | |
| download | gitlab-ce-4d2bce770bdf1b12378d3c06f895cc73d46d6f9f.tar.gz | |
Merge branch 'bvl-graphql-only-authorize-rendered-fields' into 'master'
Only check abilities on rendered GraphQL nodes
Closes #58647 and #60355
See merge request gitlab-org/gitlab-ce!27273
Diffstat (limited to 'spec/graphql/gitlab_schema_spec.rb')
| -rw-r--r-- | spec/graphql/gitlab_schema_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/graphql/gitlab_schema_spec.rb b/spec/graphql/gitlab_schema_spec.rb index 74e93b2c4df..05f10fb40f0 100644 --- a/spec/graphql/gitlab_schema_spec.rb +++ b/spec/graphql/gitlab_schema_spec.rb @@ -74,6 +74,6 @@ describe GitlabSchema do end def field_instrumenters - described_class.instrumenters[:field] + described_class.instrumenters[:field] + described_class.instrumenters[:field_after_built_ins] end end |