From 169a29a5d7c4352f2742d6e1257af6b78bc90b20 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Apr 2012 20:46:20 +0100
Subject: [PATCH] Install the local build of the oauth-plugin gem from git

---
 Gemfile      |  2 +-
 Gemfile.lock | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index bf1f2010d..6a9ca658c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,7 @@ gem 'jquery-rails'
 gem 'rails-i18n', ">= 0.6.3"
 gem 'dynamic_form'
 gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
-gem 'oauth-plugin', '>= 0.4.0.1'
+gem 'oauth-plugin', '>= 0.4.0.1', :git => "git://github.com/tomhughes/oauth-plugin.git", :branch => "openstreetmap"
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 5.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c63942158..4af9e5068 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,14 @@
+GIT
+  remote: git://github.com/tomhughes/oauth-plugin.git
+  revision: 57e80661fcb0d0a24c1f51651b1e43623b1f9a65
+  branch: openstreetmap
+  specs:
+    oauth-plugin (0.4.0.1)
+      multi_json
+      oauth (~> 0.4.4)
+      oauth2 (>= 0.5.0)
+      rack
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -44,7 +55,7 @@ GEM
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
-    execjs (1.3.0)
+    execjs (1.3.1)
       multi_json (~> 1.0)
     faraday (0.8.0)
       multipart-post (~> 1.1)
@@ -59,7 +70,7 @@ GEM
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.6.6)
+    json (1.7.0)
     libv8 (3.3.10.4)
     libxml-ruby (2.3.2)
     mail (2.4.4)
@@ -68,19 +79,14 @@ GEM
       treetop (~> 1.4.8)
     memcached (1.4.1)
     mime-types (1.18)
-    multi_json (1.3.2)
+    multi_json (1.3.4)
     multipart-post (1.1.5)
     nokogiri (1.5.2)
     oauth (0.4.6)
-    oauth-plugin (0.4.0.1)
-      multi_json
-      oauth (~> 0.4.4)
-      oauth2 (>= 0.5.0)
-      rack
-    oauth2 (0.7.0)
+    oauth2 (0.7.1)
       faraday (~> 0.8)
       httpauth (~> 0.1)
-      multi_json (~> 1.3)
+      multi_json (~> 1.0)
       rack (~> 1.4)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
@@ -131,7 +137,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    sprockets (2.1.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -165,7 +171,7 @@ DEPENDENCIES
   jquery-rails
   libxml-ruby (>= 2.0.5)
   memcached (>= 1.4.1)
-  oauth-plugin (>= 0.4.0.1)
+  oauth-plugin (>= 0.4.0.1)!
   open_id_authentication (>= 1.1.0)
   paperclip (~> 2.0)
   pg
-- 
2.43.2