From: Tom Hughes <tom@compton.nu>
Date: Sat, 7 Jul 2012 19:40:04 +0000 (+0100)
Subject: Require ruby-openid 2.2.0 or later for ruby 1.9 support
X-Git-Tag: live~5520
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/bda393e7e2604ae17b884cfd577438e34197ba5c?hp=b2723c536a24093d7f3fe5c20526428d056ffdbf

Require ruby-openid 2.2.0 or later for ruby 1.9 support
---

diff --git a/Gemfile b/Gemfile
index 7109b1236..3e3ab14de 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,6 +25,9 @@ gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
 
+# We need ruby-openid 2.2.0 or later for ruby 1.9 support
+gem 'ruby-openid', '>= 2.2.0'
+
 # Browser detection support
 gem 'browser'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 35b50a361..07f3b5bee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -115,7 +115,7 @@ GEM
       activesupport (= 3.2.6)
       bundler (~> 1.0)
       railties (= 3.2.6)
-    rails-i18n (0.6.4)
+    rails-i18n (0.6.5)
       i18n (~> 0.5)
     railties (3.2.6)
       actionpack (= 3.2.6)
@@ -129,7 +129,7 @@ GEM
       json (~> 1.4)
     redcarpet (2.1.1)
     rinku (1.5.1)
-    ruby-openid (2.1.8)
+    ruby-openid (2.2.0)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     sass (3.1.20)
@@ -182,6 +182,7 @@ DEPENDENCIES
   rails-i18n (>= 0.6.3)
   redcarpet
   rinku (>= 1.2.2)
+  ruby-openid (>= 2.2.0)
   sanitize
   sass-rails (~> 3.2.3)
   therubyracer