From 0be82cbfb52c68068298869e207c37d23d80320e Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 24 Sep 2013 15:40:38 +0100 Subject: [PATCH] Revert back to the upstream oauth-plugin --- Gemfile | 2 +- Gemfile.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 5a601d6b7..6b2fe4970 100644 --- a/Gemfile +++ b/Gemfile @@ -41,7 +41,7 @@ gem 'ejs' gem 'rails-i18n', ">= 0.6.3" gem 'dynamic_form' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' -gem 'openstreetmap-oauth-plugin', '>= 0.4.1.1', :require => 'oauth-plugin' +gem 'oauth-plugin', '>= 0.5.1' gem 'open_id_authentication', '>= 1.1.0' gem 'validates_email_format_of', '>= 1.5.1' gem 'composite_primary_keys', '>= 6.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index bc019103b..9c3460671 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,11 @@ GEM nokogiri (1.6.0) mini_portile (~> 0.5.0) oauth (0.4.7) + oauth-plugin (0.5.1) + multi_json + oauth (~> 0.4.4) + oauth2 (>= 0.5.0) + rack oauth2 (0.9.2) faraday (~> 0.8) httpauth (~> 0.2) @@ -96,11 +101,6 @@ GEM rack-openid (~> 1.3) openstreetmap-i18n-js (3.0.0.rc5.2) i18n - openstreetmap-oauth-plugin (0.4.1.2) - multi_json - oauth (~> 0.4.4) - oauth2 (>= 0.5.0) - rack paperclip (3.5.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -191,9 +191,9 @@ DEPENDENCIES kgio libxml-ruby (>= 2.0.5) minitest (~> 4.7.0) + oauth-plugin (>= 0.5.1) open_id_authentication (>= 1.1.0) openstreetmap-i18n-js (>= 3.0.0.rc5.2) - openstreetmap-oauth-plugin (>= 0.4.1.1) paperclip (~> 3.0) pg psych -- 2.43.2