diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 12:10:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-09 12:10:17 +0300 |
commit | ad0265eead72a624ce7a020847db4f0f0c877e57 (patch) | |
tree | 206e0564b02aa9530e3c95f70eb10a77e074bdf0 /app/graphql/gitlab_schema.rb | |
parent | 4dfc8711171fe0c04bc6b8b224687603026dea46 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/graphql/gitlab_schema.rb')
-rw-r--r-- | app/graphql/gitlab_schema.rb | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/app/graphql/gitlab_schema.rb b/app/graphql/gitlab_schema.rb index 3c996978b6d..592167a633b 100644 --- a/app/graphql/gitlab_schema.rb +++ b/app/graphql/gitlab_schema.rb @@ -144,4 +144,15 @@ class GitlabSchema < GraphQL::Schema end end -GitlabSchema.prepend_if_ee('EE::GitlabSchema') +GitlabSchema.prepend_if_ee('EE::GitlabSchema') # rubocop: disable Cop/InjectEnterpriseEditionModule + +# Force the schema to load as a workaround for intermittent errors we +# see due to a lack of thread safety. +# +# TODO: We can remove this workaround when we convert the schema to use +# the new query interpreter runtime. +# +# See: +# - https://gitlab.com/gitlab-org/gitlab/-/issues/211478 +# - https://gitlab.com/gitlab-org/gitlab/-/issues/210556 +GitlabSchema.graphql_definition |