Merge branch 'ac-fix-graphiql-csp' into 'master'

Fix graphql-explorer CSP violation See merge request gitlab-org/gitlab-ce!32882

Merge branch 'ac-fix-graphiql-csp' into 'master'
Fix graphql-explorer CSP violation See merge request gitlab-org/gitlab-ce!32882
d198363c · Mayra Cabrera · d20ce7de · ce201834 · d198363c · d198363c
Commit d198363c authored Sep 11, 2019 by Mayra Cabrera
Hide whitespace changes
Inline Side-by-side

Showing with 23 additions and 3 deletions

Gemfile Gemfile +3 -1

Gemfile.lock Gemfile.lock +2 -2

app/views/graphiql/rails/editors/show.html.erb app/views/graphiql/rails/editors/show.html.erb +18 -0

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -84,7 +84,9 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'

 # GraphQL API
 gem 'graphql', '~> 1.9.11'
-gem 'graphiql-rails', '~> 1.4.10'
+# 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 'apollo_upload_server', '~> 2.0.0.beta3'
 gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -398,7 +398,7 @@ GEM
      rake (~> 12)
    grape_logging (1.7.0)
      grape
-    graphiql-rails (1.4.10)
+    graphiql-rails (1.7.0)
      railties
      sprockets-rails
    graphql (1.9.11)
@@ -1142,7 +1142,7 @@ DEPENDENCIES
  grape-entity (~> 0.7.1)
  grape-path-helpers (~> 1.1)
  grape_logging (~> 1.7)
-  graphiql-rails (~> 1.4.10)
+  graphiql-rails (~> 1.7.0)
  graphql (~> 1.9.11)
  graphql-docs (~> 1.6.0)
  grpc (~> 1.19.0)

--- a/app/views/graphiql/rails/editors/show.html.erb
+++ b/app/views/graphiql/rails/editors/show.html.erb
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= GraphiQL::Rails.config.title || 'GraphiQL' %></title>
+
+    <%= stylesheet_link_tag("graphiql/rails/application") %>
+    <%= javascript_include_tag("graphiql/rails/application", nonce: true) %>
+  </head>
+  <body>
+    <%= 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
+    } %>
+  </body>
+</html>