From da6370974c81a1bb60135eb74993c0a7047cddd4 Mon Sep 17 00:00:00 2001 From: Cyril Mougel Date: Tue, 25 Jun 2013 23:45:03 +0200 Subject: [PATCH] update some gem and dev gem [ci skip] --- Gemfile | 3 ++- Gemfile.lock | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 5dd9f4c..5bd7695 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'inherited_resources' gem 'decent_exposure' gem 'strong_parameters' gem 'SystemTimer', :platform => :ruby_18 -gem 'actionmailer_inline_css', "~> 1.3.0" +gem 'actionmailer_inline_css' gem 'kaminari', '>= 0.14.1' gem 'rack-ssl-enforcer' # 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 end # gem 'rpm_contrib' # gem 'newrelic_rpm' + gem 'quiet_assets' end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 1f3cca6..4f52194 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,7 +12,7 @@ GEM actionmailer (3.2.13) actionpack (= 3.2.13) mail (~> 2.5.3) - actionmailer_inline_css (1.3.1) + actionmailer_inline_css (1.5.3) actionmailer (>= 3.0.0) nokogiri (>= 1.4.4) premailer (>= 1.7.1) @@ -90,7 +90,8 @@ GEM rest-client simplecov (>= 0.7) thor - crack (0.3.2) + crack (0.4.0) + safe_yaml (~> 0.9.0) css_parser (1.3.4) addressable daemons (1.1.9) @@ -174,7 +175,7 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - meta_request (0.2.6) + meta_request (0.2.7) callsite rack-contrib railties @@ -248,8 +249,10 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.4) - pry-rails (0.3.0) + pry-rails (0.3.1) pry (>= 0.9.10) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) rack (1.4.5) rack-cache (1.2) rack (>= 0.4) @@ -278,7 +281,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.11.0) - rake (10.0.4) + rake (10.1.0) rbx-require-relative (0.0.9) rdoc (3.12.2) json (~> 1.4) @@ -310,6 +313,7 @@ GEM rushover (0.3.0) json rest-client + safe_yaml (0.9.3) selenium-webdriver (2.33.0) childprocess (>= 0.2.5) multi_json (~> 1.0) @@ -358,14 +362,14 @@ GEM execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) underscore-rails (1.4.4) - unicorn (4.6.2) + unicorn (4.6.3) kgio (~> 2.6) rack raindrops (~> 0.7) useragent (0.6.0) warden (1.2.1) rack (>= 1.0) - webmock (1.11.0) + webmock (1.12.0) addressable (>= 2.2.7) crack (>= 0.3.2) websocket (1.0.7) @@ -379,7 +383,7 @@ PLATFORMS DEPENDENCIES SystemTimer - actionmailer_inline_css (~> 1.3.0) + actionmailer_inline_css airbrake better_errors binding_of_caller @@ -420,6 +424,7 @@ DEPENDENCIES pivotal-tracker pjax_rails pry-rails + quiet_assets rack-ssl rack-ssl-enforcer rails (= 3.2.13) -- libgit2 0.21.2