Download as
Browse Code »

Commit da6370974c81a1bb60135eb74993c0a7047cddd4

Authored by Cyril Mougel
1 parent ea7823ed
Exists in master and in 1 other branch production

update some gem and dev gem [ci skip]

Showing 2 changed files with 15 additions and 9 deletions   Show diff stats
@@ -15,7 +15,7 @@ gem 'inherited_resources' @@ -15,7 +15,7 @@ gem 'inherited_resources'
15 gem 'decent_exposure' 15 gem 'decent_exposure'
16 gem 'strong_parameters' 16 gem 'strong_parameters'
17 gem 'SystemTimer', :platform => :ruby_18 17 gem 'SystemTimer', :platform => :ruby_18
18 -gem 'actionmailer_inline_css', "~> 1.3.0" 18 +gem 'actionmailer_inline_css'
19 gem 'kaminari', '>= 0.14.1' 19 gem 'kaminari', '>= 0.14.1'
20 gem 'rack-ssl-enforcer' 20 gem 'rack-ssl-enforcer'
21 # fabrication 1.3.0 is last supporting ruby 1.8. Update when stop supporting this version too 21 # fabrication 1.3.0 is last supporting ruby 1.8. Update when stop supporting this version too
@@ -92,6 +92,7 @@ group :development, :test do @@ -92,6 +92,7 @@ group :development, :test do
92 end 92 end
93 # gem 'rpm_contrib' 93 # gem 'rpm_contrib'
94 # gem 'newrelic_rpm' 94 # gem 'newrelic_rpm'
  95 + gem 'quiet_assets'
95 end 96 end
96 97
97 group :development do 98 group :development do
@@ -12,7 +12,7 @@ GEM @@ -12,7 +12,7 @@ GEM
12 actionmailer (3.2.13) 12 actionmailer (3.2.13)
13 actionpack (= 3.2.13) 13 actionpack (= 3.2.13)
14 mail (~> 2.5.3) 14 mail (~> 2.5.3)
15 - actionmailer_inline_css (1.3.1) 15 + actionmailer_inline_css (1.5.3)
16 actionmailer (>= 3.0.0) 16 actionmailer (>= 3.0.0)
17 nokogiri (>= 1.4.4) 17 nokogiri (>= 1.4.4)
18 premailer (>= 1.7.1) 18 premailer (>= 1.7.1)
@@ -90,7 +90,8 @@ GEM @@ -90,7 +90,8 @@ GEM
90 rest-client 90 rest-client
91 simplecov (>= 0.7) 91 simplecov (>= 0.7)
92 thor 92 thor
93 - crack (0.3.2) 93 + crack (0.4.0)
  94 + safe_yaml (~> 0.9.0)
94 css_parser (1.3.4) 95 css_parser (1.3.4)
95 addressable 96 addressable
96 daemons (1.1.9) 97 daemons (1.1.9)
@@ -174,7 +175,7 @@ GEM @@ -174,7 +175,7 @@ GEM
174 mail (2.5.4) 175 mail (2.5.4)
175 mime-types (~> 1.16) 176 mime-types (~> 1.16)
176 treetop (~> 1.4.8) 177 treetop (~> 1.4.8)
177 - meta_request (0.2.6) 178 + meta_request (0.2.7)
178 callsite 179 callsite
179 rack-contrib 180 rack-contrib
180 railties 181 railties
@@ -248,8 +249,10 @@ GEM @@ -248,8 +249,10 @@ GEM
248 coderay (~> 1.0.5) 249 coderay (~> 1.0.5)
249 method_source (~> 0.8) 250 method_source (~> 0.8)
250 slop (~> 3.4) 251 slop (~> 3.4)
251 - pry-rails (0.3.0) 252 + pry-rails (0.3.1)
252 pry (>= 0.9.10) 253 pry (>= 0.9.10)
  254 + quiet_assets (1.0.2)
  255 + railties (>= 3.1, < 5.0)
253 rack (1.4.5) 256 rack (1.4.5)
254 rack-cache (1.2) 257 rack-cache (1.2)
255 rack (>= 0.4) 258 rack (>= 0.4)
@@ -278,7 +281,7 @@ GEM @@ -278,7 +281,7 @@ GEM
278 rdoc (~> 3.4) 281 rdoc (~> 3.4)
279 thor (>= 0.14.6, < 2.0) 282 thor (>= 0.14.6, < 2.0)
280 raindrops (0.11.0) 283 raindrops (0.11.0)
281 - rake (10.0.4) 284 + rake (10.1.0)
282 rbx-require-relative (0.0.9) 285 rbx-require-relative (0.0.9)
283 rdoc (3.12.2) 286 rdoc (3.12.2)
284 json (~> 1.4) 287 json (~> 1.4)
@@ -310,6 +313,7 @@ GEM @@ -310,6 +313,7 @@ GEM
310 rushover (0.3.0) 313 rushover (0.3.0)
311 json 314 json
312 rest-client 315 rest-client
  316 + safe_yaml (0.9.3)
313 selenium-webdriver (2.33.0) 317 selenium-webdriver (2.33.0)
314 childprocess (>= 0.2.5) 318 childprocess (>= 0.2.5)
315 multi_json (~> 1.0) 319 multi_json (~> 1.0)
@@ -358,14 +362,14 @@ GEM @@ -358,14 +362,14 @@ GEM
358 execjs (>= 0.3.0) 362 execjs (>= 0.3.0)
359 multi_json (~> 1.0, >= 1.0.2) 363 multi_json (~> 1.0, >= 1.0.2)
360 underscore-rails (1.4.4) 364 underscore-rails (1.4.4)
361 - unicorn (4.6.2) 365 + unicorn (4.6.3)
362 kgio (~> 2.6) 366 kgio (~> 2.6)
363 rack 367 rack
364 raindrops (~> 0.7) 368 raindrops (~> 0.7)
365 useragent (0.6.0) 369 useragent (0.6.0)
366 warden (1.2.1) 370 warden (1.2.1)
367 rack (>= 1.0) 371 rack (>= 1.0)
368 - webmock (1.11.0) 372 + webmock (1.12.0)
369 addressable (>= 2.2.7) 373 addressable (>= 2.2.7)
370 crack (>= 0.3.2) 374 crack (>= 0.3.2)
371 websocket (1.0.7) 375 websocket (1.0.7)
@@ -379,7 +383,7 @@ PLATFORMS @@ -379,7 +383,7 @@ PLATFORMS
379 383
380 DEPENDENCIES 384 DEPENDENCIES
381 SystemTimer 385 SystemTimer
382 - actionmailer_inline_css (~> 1.3.0) 386 + actionmailer_inline_css
383 airbrake 387 airbrake
384 better_errors 388 better_errors
385 binding_of_caller 389 binding_of_caller
@@ -420,6 +424,7 @@ DEPENDENCIES @@ -420,6 +424,7 @@ DEPENDENCIES
420 pivotal-tracker 424 pivotal-tracker
421 pjax_rails 425 pjax_rails
422 pry-rails 426 pry-rails
  427 + quiet_assets
423 rack-ssl 428 rack-ssl
424 rack-ssl-enforcer 429 rack-ssl-enforcer
425 rails (= 3.2.13) 430 rails (= 3.2.13)