From 3fe6ddbe1ab9c480f353fa139ec6020c17e8e3cb Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Sat, 5 May 2018 11:02:40 +0200
Subject: [PATCH] Update gon ~> 6.1.0 to ~> 6.2
---
Gemfile | 2 +-
Gemfile.lock | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Gemfile b/Gemfile
index a139e8a32c478..745b4f7d0e0a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -260,7 +260,7 @@ gem 'addressable', '~> 2.5.2'
gem 'bootstrap-sass', '~> 3.3.0'
gem 'font-awesome-rails', '~> 4.7'
gem 'gemojione', '~> 3.3'
-gem 'gon', '~> 6.1.0'
+gem 'gon', '~> 6.2'
gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'request_store', '~> 1.3'
gem 'select2-rails', '~> 3.5.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index f7e2428a07f46..86e4fe6874faf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,9 +334,8 @@ GEM
activesupport (>= 4.2.0)
gollum-grit_adapter (1.0.1)
gitlab-grit (~> 2.7, >= 2.7.1)
- gon (6.1.0)
+ gon (6.2.0)
actionpack (>= 3.0)
- json
multi_json
request_store (>= 1.0)
google-api-client (0.19.8)
@@ -1068,7 +1067,7 @@ DEPENDENCIES
gitlab-markup (~> 1.6.2)
gitlab-styles (~> 2.3)
gitlab_omniauth-ldap (~> 2.0.4)
- gon (~> 6.1.0)
+ gon (~> 6.2)
google-api-client (~> 0.19.8)
google-protobuf (= 3.5.1)
gpgme
--
GitLab