diff --git a/Gemfile b/Gemfile index 2019cae8f96ffc1ad330e4a3f738e0434427b91b..d34603e8ce162fd893eb9f2b675b168461be75bf 100644 --- a/Gemfile +++ b/Gemfile @@ -154,7 +154,7 @@ gem "raphael-rails", "~> 2.1.2" gem 'bootstrap-sass', '~> 2.3' gem "font-awesome-rails", '~> 3.2' gem "gemoji", "~> 1.3.0" -gem "gon", git: "https://github.com/gitlabhq/gon.git", ref: '58ca8e17273051cb370182cabd3602d1da6783ab' +gem "gon", "~> 5.0.0" group :development do gem "annotate", "~> 2.6.0.beta2" diff --git a/Gemfile.lock b/Gemfile.lock index 8aad7c8c424e71ebf890e867bc13e488d094515b..29eb52a5bd76a36956964366a56b479880d54272 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,3 @@ -GIT - remote: https://github.com/gitlabhq/gon.git - revision: 58ca8e17273051cb370182cabd3602d1da6783ab - ref: 58ca8e17273051cb370182cabd3602d1da6783ab - specs: - gon (4.1.1) - actionpack (>= 2.3.0) - json - GEM remote: https://rubygems.org/ specs: @@ -206,6 +197,9 @@ GEM omniauth (~> 1.0) pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) + gon (5.0.0) + actionpack (>= 2.3.0) + json grape (0.6.1) activesupport builder