X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/169a29a5d7c4352f2742d6e1257af6b78bc90b20..ca3baf15be5744b2642e026072d177b8382faaab:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 4af9e5068..0ea879021 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,14 +1,3 @@ -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: @@ -90,6 +79,11 @@ GEM rack (~> 1.4) open_id_authentication (1.1.0) rack-openid (~> 1.3) + openstreetmap-oauth-plugin (0.4.0.1) + multi_json + oauth (~> 0.4.4) + oauth2 (>= 0.5.0) + rack paperclip (2.7.0) activerecord (>= 2.3.0) activesupport (>= 2.3.2) @@ -171,8 +165,8 @@ DEPENDENCIES jquery-rails libxml-ruby (>= 2.0.5) memcached (>= 1.4.1) - oauth-plugin (>= 0.4.0.1)! open_id_authentication (>= 1.1.0) + openstreetmap-oauth-plugin (>= 0.4.0.1) paperclip (~> 2.0) pg rails (= 3.2.3)