Add latest changes from gitlab-org/gitlab@master

This commit is contained in:
GitLab Bot 2020-05-30 06:08:31 +00:00
parent 5281a20554
commit f0da8353ce
2 changed files with 2 additions and 4 deletions

View file

@ -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'

View file

@ -1,7 +1,5 @@
# frozen_string_literal: true
require "json-schema"
#
# JsonSchemaValidator
#
# Custom validator for json schema.