<%= GraphiQL::Rails.config.title || 'GraphiQL' %>

From 4d70537cd11520b5e1d368b52cfe889d2a57caea Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 11 Sep 2019 23:26:53 -0700 Subject: Revert "Update to graphiql-rails v1.7.10" This reverts commit f222e74d455ec9fc10efb783ffe4684836cc1c3b. --- Gemfile | 3 +- Gemfile.lock | 4 +- app/views/graphiql/rails/editors/show.html.erb | 99 +++++++++++++++++++++++--- 3 files changed, 93 insertions(+), 13 deletions(-) diff --git a/Gemfile b/Gemfile index d79e97aabdd..734104a25bc 100644 --- a/Gemfile +++ b/Gemfile @@ -85,8 +85,7 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API gem 'graphql', '~> 1.9.11' # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 will be released -# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263 -gem 'graphiql-rails', '~> 1.7.0' +gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] diff --git a/Gemfile.lock b/Gemfile.lock index 025542422d3..3952d068678 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -402,7 +402,7 @@ GEM rake (~> 12) grape_logging (1.7.0) grape - graphiql-rails (1.7.0) + graphiql-rails (1.4.10) railties sprockets-rails graphql (1.9.11) @@ -1150,7 +1150,7 @@ DEPENDENCIES grape-entity (~> 0.7.1) grape-path-helpers (~> 1.1) grape_logging (~> 1.7) - graphiql-rails (~> 1.7.0) + graphiql-rails (~> 1.4.10) graphql (~> 1.9.11) graphql-docs (~> 1.6.0) grpc (~> 1.19.0) diff --git a/app/views/graphiql/rails/editors/show.html.erb b/app/views/graphiql/rails/editors/show.html.erb index abb1ed0e772..df54b5821ee 100644 --- a/app/views/graphiql/rails/editors/show.html.erb +++ b/app/views/graphiql/rails/editors/show.html.erb @@ -1,18 +1,99 @@ - <%= GraphiQL::Rails.config.title || 'GraphiQL' %> - + GraphiQL <%= stylesheet_link_tag("graphiql/rails/application") %> + <%# TODO: This file was included to fix a CSP failure. Please remove when https://github.com/rmosolgo/graphiql-rails/pull/71 will be released %> <%= javascript_include_tag("graphiql/rails/application", nonce: true) %> - <%= content_tag :div, 'Loading...', id: 'graphiql-container', data: { - graphql_endpoint_path: graphql_endpoint_path, - initial_query: GraphiQL::Rails.config.initial_query, - logo: GraphiQL::Rails.config.logo, - headers: GraphiQL::Rails.config.resolve_headers(self), - query_params: GraphiQL::Rails.config.query_params - } %> +

+ Loading... +

+ -- cgit v1.2.1 From e078d51566a276558a0bbd283f8acc472d4530c9 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 11 Sep 2019 23:37:51 -0700 Subject: Add CSP nonce to graphiql-rails JavaScript --- Gemfile | 4 +++- app/views/graphiql/rails/editors/show.html.erb | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 734104a25bc..7fb9838b8b0 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,9 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors' # GraphQL API gem 'graphql', '~> 1.9.11' -# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 will be released +# NOTE: graphiql-rails v1.5+ doesn't work: https://gitlab.com/gitlab-org/gitlab-ce/issues/67293 +# TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: +# https://gitlab.com/gitlab-org/gitlab-ce/issues/67263 gem 'graphiql-rails', '~> 1.4.10' gem 'apollo_upload_server', '~> 2.0.0.beta3' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] diff --git a/app/views/graphiql/rails/editors/show.html.erb b/app/views/graphiql/rails/editors/show.html.erb index df54b5821ee..b8f82ae8323 100644 --- a/app/views/graphiql/rails/editors/show.html.erb +++ b/app/views/graphiql/rails/editors/show.html.erb @@ -10,7 +10,7 @@

- + <% end -%> -- cgit v1.2.1