Merge branch 'feature/rails4' into feature/20325-rails4-deprecated-dynamic-finders

9 years ago · 35974beb7c
parent 7f99c51b76 a1f3d2af7d
commit 35974beb7c
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@ -43,7 +43,7 @@ gem 'request_store', '~> 1.1.0'
 gem 'gravatar_image_tag', '~> 1.2.0'

 gem 'warden', '~> 1.2'
-gem 'warden-basic_auth', '~> 0.2.0'
+gem 'warden-basic_auth', '~> 0.2.1'

 # TODO: adds #auto_link which was deprecated in rails 3.1
 gem 'rails_autolink', '~> 1.1.6'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -558,7 +558,7 @@ DEPENDENCIES
  uglifier (>= 1.0.3)
  unicorn
  warden (~> 1.2)
-  warden-basic_auth (~> 0.2.0)
+  warden-basic_auth (~> 0.2.1)
  will_paginate (~> 3.0)

 BUNDLED WITH