summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2018-05-10 15:50:13 +0000
committerRobert Speicher <robert@gitlab.com>2018-05-10 15:50:13 +0000
commit0afcfd31bdf8d23bc180d5a36796aba8e66dbd33 (patch)
tree244fec92897cf812be04feb9c14fe3e69de9dfa7 /Gemfile
parentf667bbceaba7556d5fb2adadce4b7d170b914e8a (diff)
parent3fe6ddbe1ab9c480f353fa139ec6020c17e8e3cb (diff)
downloadgitlab-ce-0afcfd31bdf8d23bc180d5a36796aba8e66dbd33.tar.gz
Merge branch 'update-gon' into 'master'
Update gon ~> 6.1.0 to ~> 6.2 See merge request gitlab-org/gitlab-ce!18764
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ccab7685b2e..886925e0674 100644
--- a/Gemfile
+++ b/Gemfile
@@ -257,7 +257,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'