diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-05 13:29:21 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-05 13:29:21 +0200 |
| commit | 46e0e59217ce77690cc5de8de0e984ee7550aafe (patch) | |
| tree | e6f6f3284edb7caddb272ba6d350c2eff5af4f5f /Gemfile.lock | |
| parent | d25b5d029d539ccccbea25d7efceeddbf4002459 (diff) | |
| download | gitlab-ce-46e0e59217ce77690cc5de8de0e984ee7550aafe.tar.gz | |
Use latest gon gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 1c30c17ed7b..75083623894 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 |