Commit 180ab9757188457f67603814c4bfedee8c72c94b

Authored by Dmitriy Zaporozhets
2 parents 42131d01 5b2ac3fa

Merge pull request #5955 from wishlistmaster/6-4-stable

Gem 'gon' issue on Ubuntu LTS
Showing 2 changed files with 4 additions and 10 deletions   Show diff stats
@@ -154,7 +154,7 @@ gem "raphael-rails", "~> 2.1.2" @@ -154,7 +154,7 @@ gem "raphael-rails", "~> 2.1.2"
154 gem 'bootstrap-sass', '~> 2.3' 154 gem 'bootstrap-sass', '~> 2.3'
155 gem "font-awesome-rails", '~> 3.2' 155 gem "font-awesome-rails", '~> 3.2'
156 gem "gemoji", "~> 1.3.0" 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 group :development do 159 group :development do
160 gem "annotate", "~> 2.6.0.beta2" 160 gem "annotate", "~> 2.6.0.beta2"
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 GEM 1 GEM
11 remote: https://rubygems.org/ 2 remote: https://rubygems.org/
12 specs: 3 specs:
@@ -206,6 +197,9 @@ GEM @@ -206,6 +197,9 @@ GEM
206 omniauth (~> 1.0) 197 omniauth (~> 1.0)
207 pyu-ruby-sasl (~> 0.0.3.1) 198 pyu-ruby-sasl (~> 0.0.3.1)
208 rubyntlm (~> 0.1.1) 199 rubyntlm (~> 0.1.1)
  200 + gon (5.0.0)
  201 + actionpack (>= 2.3.0)
  202 + json
209 grape (0.6.1) 203 grape (0.6.1)
210 activesupport 204 activesupport
211 builder 205 builder