Download as
Browse Code »

Commit acbac26a5a847f7e5aadeae0a67219d651fb8913

Authored by Dmitriy Zaporozhets
1 parent ede27240
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use gems that works with rails 4 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 30 additions and 26 deletions   Show diff stats
Gemfile
  Diff comments   View file @acbac26
... ... @@ -134,26 +134,24 @@ gem &quot;sanitize&quot;
134 134 # Protect against bruteforcing
135 135 gem "rack-attack"
136 136  
137   -group :assets do
138   - gem "sass-rails"
139   - gem "coffee-rails"
140   - gem "uglifier"
141   - gem "therubyracer"
142   - gem 'turbolinks'
143   - gem 'jquery-turbolinks'
144   -
145   - gem 'chosen-rails', "1.0.1"
146   - gem 'select2-rails'
147   - gem 'jquery-atwho-rails', "0.3.0"
148   - gem "jquery-rails", "2.1.3"
149   - gem "jquery-ui-rails", "2.0.2"
150   - gem "modernizr", "2.6.2"
151   - gem "raphael-rails", "~> 2.1.2"
152   - gem 'bootstrap-sass', '~> 2.3'
153   - gem "font-awesome-rails", '~> 3.2'
154   - gem "gemoji", "~> 1.3.0"
155   - gem "gon"
156   -end
  137 +gem "sass-rails"
  138 +gem "coffee-rails"
  139 +gem "uglifier"
  140 +gem "therubyracer"
  141 +gem 'turbolinks'
  142 +gem 'jquery-turbolinks'
  143 +
  144 +gem 'chosen-rails', "1.0.1"
  145 +gem 'select2-rails'
  146 +gem 'jquery-atwho-rails', "~> 0.4.1"
  147 +gem "jquery-rails", "2.1.3"
  148 +gem "jquery-ui-rails", "2.0.2"
  149 +gem "modernizr", "2.6.2"
  150 +gem "raphael-rails", "~> 2.1.2"
  151 +gem 'bootstrap-sass', '~> 2.3'
  152 +gem "font-awesome-rails", '~> 3.2'
  153 +gem "gemoji", "~> 1.3.0"
  154 +gem "gon", git: "https://github.com/gitlabhq/gon.git", ref: '58ca8e17273051cb370182cabd3602d1da6783ab'
157 155  
158 156 group :development do
159 157 gem "annotate", "~> 2.6.0.beta2"
... ...
Gemfile.lock
  Diff comments   View file @acbac26
  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 +
1 10 GEM
2 11 remote: https://rubygems.org/
3 12 specs:
... ... @@ -201,9 +210,6 @@ GEM
201 210 omniauth (~> 1.0)
202 211 pyu-ruby-sasl (~> 0.0.3.1)
203 212 rubyntlm (~> 0.1.1)
204   - gon (4.1.1)
205   - actionpack (>= 2.3.0)
206   - json
207 213 grape (0.4.1)
208 214 activesupport
209 215 builder
... ... @@ -255,7 +261,7 @@ GEM
255 261 rspec (>= 1.3.1)
256 262 selenium-webdriver (>= 0.1.3)
257 263 jasmine-core (1.3.1)
258   - jquery-atwho-rails (0.3.0)
  264 + jquery-atwho-rails (0.4.1)
259 265 jquery-rails (2.1.3)
260 266 railties (>= 3.1.0, < 5.0)
261 267 thor (~> 0.14)
... ... @@ -601,7 +607,7 @@ DEPENDENCIES
601 607 gitlab_git (~> 4.0.0.pre)
602 608 gitlab_meta (= 6.0)
603 609 gitlab_omniauth-ldap (= 1.0.3)
604   - gon
  610 + gon!
605 611 grape (~> 0.4.1)
606 612 grape-entity (~> 0.3.0)
607 613 growl
... ... @@ -611,7 +617,7 @@ DEPENDENCIES
611 617 hipchat (~> 0.9.0)
612 618 httparty
613 619 jasmine
614   - jquery-atwho-rails (= 0.3.0)
  620 + jquery-atwho-rails (~> 0.4.1)
615 621 jquery-rails (= 2.1.3)
616 622 jquery-turbolinks
617 623 jquery-ui-rails (= 2.0.2)
... ...