diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-05 00:42:13 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-01-05 00:42:13 +0400 |
| commit | 180ab9757188457f67603814c4bfedee8c72c94b (patch) | |
| tree | 11386944658fb23b3d319e92255344a6e6e76d4b | |
| parent | 42131d0189bbc0e88be72e6a76405140cbd79fc8 (diff) | |
| parent | 5b2ac3fa26cb2c7ba92f76537133f6334b8bc47c (diff) | |
Merge pull request #5955 from wishlistmaster/6-4-stable
Gem 'gon' issue on Ubuntu LTS
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 12 |
2 files changed, 4 insertions, 10 deletions
@@ -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 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 |