Download as
Browse Code »

Commit 46e0e59217ce77690cc5de8de0e984ee7550aafe

Authored by Dmitriy Zaporozhets
1 parent d25b5d02
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Use latest gon gem 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 5 additions and 11 deletions   Show diff stats
Gemfile
  Diff comments   View file @46e0e59
... ... @@ -154,7 +154,7 @@ gem &quot;raphael-rails&quot;, &quot;~&gt; 2.1.2&quot;
154 154 gem 'bootstrap-sass', '~> 3.0'
155 155 gem "font-awesome-rails", '~> 3.2'
156 156 gem "gemoji", "~> 1.3.0"
157   -gem "gon", git: "https://github.com/gitlabhq/gon.git", ref: '58ca8e17273051cb370182cabd3602d1da6783ab'
  157 +gem "gon", '~> 5.0.0'
158 158  
159 159 group :development do
160 160 gem "annotate", "~> 2.6.0.beta2"
... ...
Gemfile.lock
  Diff comments   View file @46e0e59
1 1 GIT
2   - remote: https://github.com/gitlabhq/gon.git
3   - revision: 58ca8e17273051cb370182cabd3602d1da6783ab
4   - ref: 58ca8e17273051cb370182cabd3602d1da6783ab
5   - specs:
6   - gon (4.1.1)
7   - actionpack (>= 2.3.0)
8   - json
9   -
10   -GIT
11 2 remote: https://github.com/gitlabhq/markup.git
12 3 revision: 61ade389c1e1c159359338f570d18464a44ddbc4
13 4 ref: 61ade389c1e1c159359338f570d18464a44ddbc4
... ... @@ -212,6 +203,9 @@ GEM
212 203 omniauth (~> 1.0)
213 204 pyu-ruby-sasl (~> 0.0.3.1)
214 205 rubyntlm (~> 0.1.1)
  206 + gon (5.0.1)
  207 + actionpack (>= 2.3.0)
  208 + json
215 209 grape (0.6.1)
216 210 activesupport
217 211 builder
... ... @@ -603,7 +597,7 @@ DEPENDENCIES
603 597 gitlab_git (~> 4.0.0)
604 598 gitlab_meta (= 6.0)
605 599 gitlab_omniauth-ldap (= 1.0.3)
606   - gon!
  600 + gon (~> 5.0.0)
607 601 grape (~> 0.6.1)
608 602 grape-entity (~> 0.3.0)
609 603 growl
... ...