From 46e0e59217ce77690cc5de8de0e984ee7550aafe Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 5 Jan 2014 13:29:21 +0200
Subject: [PATCH] Use latest gon gem

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5d6f519..0e5261b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -154,7 +154,7 @@ gem "raphael-rails", "~> 2.1.2"
 gem 'bootstrap-sass', '~> 3.0'
 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 1c30c17..7508362 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,4 @@
 GIT
-  remote: https://github.com/gitlabhq/gon.git
-  revision: 58ca8e17273051cb370182cabd3602d1da6783ab
-  ref: 58ca8e17273051cb370182cabd3602d1da6783ab
-  specs:
-    gon (4.1.1)
-      actionpack (>= 2.3.0)
-      json
-
-GIT
   remote: https://github.com/gitlabhq/markup.git
   revision: 61ade389c1e1c159359338f570d18464a44ddbc4
   ref: 61ade389c1e1c159359338f570d18464a44ddbc4
@@ -212,6 +203,9 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.1.1)
+    gon (5.0.1)
+      actionpack (>= 2.3.0)
+      json
     grape (0.6.1)
       activesupport
       builder
@@ -603,7 +597,7 @@ DEPENDENCIES
   gitlab_git (~> 4.0.0)
   gitlab_meta (= 6.0)
   gitlab_omniauth-ldap (= 1.0.3)
-  gon!
+  gon (~> 5.0.0)
   grape (~> 0.6.1)
   grape-entity (~> 0.3.0)
   growl
--
libgit2 0.21.2