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