Commit 3c7bbb8f authored by Thong Kuah's avatar Thong Kuah

Merge branch 'id-bump-grape' into 'master'

[RUN ALL RSPEC] Update grape gem to 1.5.2

See merge request gitlab-org/gitlab!53547
parents b93bdfaa 23a6a8ce
......@@ -81,7 +81,7 @@ gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap'
gem 'net-ldap', '~> 0.16.3'
# API
gem 'grape', '~> 1.5.1'
gem 'grape', '~> 1.5.2'
gem 'grape-entity', '~> 0.7.1'
gem 'rack-cors', '~> 1.0.6', require: 'rack/cors'
......
......@@ -495,7 +495,7 @@ GEM
signet (~> 0.14)
gpgme (2.0.20)
mini_portile2 (~> 2.3)
grape (1.5.1)
grape (1.5.2)
activesupport
builder
dry-types (>= 1.1)
......@@ -1387,7 +1387,7 @@ DEPENDENCIES
google-api-client (~> 0.33)
google-protobuf (~> 3.12)
gpgme (~> 2.0.19)
grape (~> 1.5.1)
grape (~> 1.5.2)
grape-entity (~> 0.7.1)
grape-path-helpers (~> 1.6.1)
grape_logging (~> 1.7)
......
---
title: Update grape gem to 1.5.2
merge_request: 53547
author:
type: other
......@@ -58,9 +58,6 @@ module DeprecationToolkitEnv
spec/support/gitlab_experiment.rb
activerecord-6.0.3.4/lib/active_record/migration.rb
devise-4.7.3/lib/devise/test/controller_helpers.rb
grape-1.5.1/lib/grape/middleware/stack.rb
grape-1.5.1/lib/grape/validations/validators/coerce.rb
grape_logging-1.8.3/lib/grape_logging/middleware/request_logger.rb
activesupport-6.0.3.4/lib/active_support/cache.rb
batch-loader-1.4.0/lib/batch_loader/graphql.rb
carrierwave-1.3.1/lib/carrierwave/sanitized_file.rb
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment