From: Tom Hughes <tom@compton.nu>
Date: Sun, 18 Sep 2011 18:32:52 +0000 (+0100)
Subject: Require version 1.1.0 or later of open_id_authentication
X-Git-Tag: live~6099
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/62e571a4aaa7324fe56c6c58a0dca5f943e7f9ee

Require version 1.1.0 or later of open_id_authentication
---

diff --git a/Gemfile b/Gemfile
index 56d90a57f..2de8c0cf2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,7 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'sanitize'
 gem 'rails-i18n-updater'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'open_id_authentication', '>= 1.0.0'
+gem 'open_id_authentication', '>= 1.1.0'
 
 # Should only load if memcache is in use
 #gem 'memcached'
diff --git a/Gemfile.lock b/Gemfile.lock
index 868d9d514..7bd2eeeb2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,7 +61,7 @@ GEM
     oauth2 (0.5.0)
       faraday (< 0.8, >= 0.6.1)
       multi_json (~> 1.0.0)
-    open_id_authentication (1.0.0)
+    open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     pg (0.11.0)
     polyglot (0.3.2)
@@ -116,11 +116,11 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   oauth (>= 0.4.4)
   oauth-plugin (>= 0.4.0.pre4)
-  open_id_authentication (>= 1.0.0)
+  open_id_authentication (>= 1.1.0)
   pg
   rails (= 3.0.10)
   rails-i18n-updater
   rmagick
   sanitize
   timecop
-  validates_email_format_of (~> 1.5.1)
+  validates_email_format_of (>= 1.5.1)