From eae84c0c37878675f6068190b14e428d6ee9b0b4 Mon Sep 17 00:00:00 2001 From: Manly Florido Date: Mon, 30 Dec 2013 15:24:47 +0800 Subject: [PATCH 1/2] Update Gemfile --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 2019cae8f96..d34603e8ce1 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" -- GitLab From 5b2ac3fa26cb2c7ba92f76537133f6334b8bc47c Mon Sep 17 00:00:00 2001 From: Manly Florido Date: Mon, 30 Dec 2013 15:33:15 +0800 Subject: [PATCH 2/2] Update Gemfile.lock --- Gemfile.lock | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8aad7c8c424..29eb52a5bd7 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 -- GitLab