Commit 1e53fc7e authored by Jan Provaznik's avatar Jan Provaznik

Merge branch 'id-bump-gon-version' into 'master'

Update gon gem to 6.4.0

See merge request gitlab-org/gitlab!51210
parents ebb5e2d7 f3f81340
...@@ -108,7 +108,7 @@ gem 'hashie-forbidden_attributes' ...@@ -108,7 +108,7 @@ gem 'hashie-forbidden_attributes'
gem 'kaminari', '~> 1.0' gem 'kaminari', '~> 1.0'
# HAML # HAML
gem 'hamlit', '~> 2.14.4' gem 'hamlit', '~> 2.15.0'
# Files attachments # Files attachments
gem 'carrierwave', '~> 1.3' gem 'carrierwave', '~> 1.3'
...@@ -294,7 +294,7 @@ gem 'terser', '1.0.2' ...@@ -294,7 +294,7 @@ gem 'terser', '1.0.2'
gem 'addressable', '~> 2.7' gem 'addressable', '~> 2.7'
gem 'gemojione', '~> 3.3' gem 'gemojione', '~> 3.3'
gem 'gon', '~> 6.2' gem 'gon', '~> 6.4.0'
gem 'request_store', '~> 1.5' gem 'request_store', '~> 1.5'
gem 'base32', '~> 0.3.0' gem 'base32', '~> 0.3.0'
......
...@@ -499,8 +499,9 @@ GEM ...@@ -499,8 +499,9 @@ GEM
rubyntlm (~> 0.5) rubyntlm (~> 0.5)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gon (6.2.0) gon (6.4.0)
actionpack (>= 3.0) actionpack (>= 3.0.20)
i18n (>= 0.7)
multi_json multi_json
request_store (>= 1.0) request_store (>= 1.0)
google-api-client (0.50.0) google-api-client (0.50.0)
...@@ -591,7 +592,7 @@ GEM ...@@ -591,7 +592,7 @@ GEM
rainbow rainbow
rubocop (>= 0.50.0) rubocop (>= 0.50.0)
sysexits (~> 1.1) sysexits (~> 1.1)
hamlit (2.14.4) hamlit (2.15.0)
temple (>= 0.8.2) temple (>= 0.8.2)
thor thor
tilt tilt
...@@ -1444,7 +1445,7 @@ DEPENDENCIES ...@@ -1444,7 +1445,7 @@ DEPENDENCIES
gitlab-styles (~> 6.2.0) gitlab-styles (~> 6.2.0)
gitlab_chronic_duration (~> 0.10.6.2) gitlab_chronic_duration (~> 0.10.6.2)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.4.0)
google-api-client (~> 0.33) google-api-client (~> 0.33)
google-protobuf (~> 3.14.0) google-protobuf (~> 3.14.0)
gpgme (~> 2.0.19) gpgme (~> 2.0.19)
...@@ -1460,7 +1461,7 @@ DEPENDENCIES ...@@ -1460,7 +1461,7 @@ DEPENDENCIES
gssapi gssapi
guard-rspec guard-rspec
haml_lint (~> 0.36.0) haml_lint (~> 0.36.0)
hamlit (~> 2.14.4) hamlit (~> 2.15.0)
hangouts-chat (~> 0.0.5) hangouts-chat (~> 0.0.5)
hashie hashie
hashie-forbidden_attributes hashie-forbidden_attributes
......
---
title: Update gon gem to 6.4.0
merge_request: 51210
author:
type: other
...@@ -56,7 +56,6 @@ module DeprecationToolkitEnv ...@@ -56,7 +56,6 @@ module DeprecationToolkitEnv
def self.allowed_kwarg_warning_paths def self.allowed_kwarg_warning_paths
%w[ %w[
activerecord-6.0.3.4/lib/active_record/migration.rb activerecord-6.0.3.4/lib/active_record/migration.rb
devise-4.7.3/lib/devise/test/controller_helpers.rb
activesupport-6.0.3.4/lib/active_support/cache.rb activesupport-6.0.3.4/lib/active_support/cache.rb
batch-loader-1.4.0/lib/batch_loader/graphql.rb batch-loader-1.4.0/lib/batch_loader/graphql.rb
carrierwave-1.3.1/lib/carrierwave/sanitized_file.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