From f0da8353ce1200ab7cb09d92d111f0db9784be81 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 30 May 2020 06:08:31 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 Gemfile                                 | 2 +-
 app/validators/json_schema_validator.rb | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5483fd5ca15..00ec5e5c58d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -402,7 +402,6 @@ group :test do
 
   gem 'shoulda-matchers', '~> 4.0.1', require: false
   gem 'email_spec', '~> 2.2.0'
-  gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 3.5.1'
   gem 'rails-controller-testing'
   gem 'concurrent-ruby', '~> 1.1'
@@ -497,3 +496,4 @@ gem 'valid_email', '~> 0.1'
 
 # JSON
 gem 'json', '~> 2.3.0'
+gem 'json-schema', '~> 2.8.0'
diff --git a/app/validators/json_schema_validator.rb b/app/validators/json_schema_validator.rb
index 89dd660bc16..f84186c9ced 100644
--- a/app/validators/json_schema_validator.rb
+++ b/app/validators/json_schema_validator.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
-
-require "json-schema"
-
+#
 # JsonSchemaValidator
 #
 # Custom validator for json schema.