cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Install the local build of the oauth-plugin gem from git"

Browse source 
This reverts commit 169a29a5d7.
This commit is contained in:
Tom Hughes 2012-04-29 22:52:28 +01:00
parent 169a29a5d7
commit 7f18acbd6d
2 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -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', :git => "git://github.com/tomhughes/oauth-plugin.git", :branch => "openstreetmap"
gem 'oauth-plugin', '>= 0.4.0.1'
gem 'open_id_authentication', '>= 1.1.0'
gem 'validates_email_format_of', '>= 1.5.1'
gem 'composite_primary_keys', '>= 5.0.0'

30
Gemfile.lock
View file

@ -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:
@ -55,7 +44,7 @@ GEM
deadlock_retry (1.2.0)
dynamic_form (1.1.4)
erubis (2.7.0)
execjs (1.3.1)
execjs (1.3.0)
multi_json (~> 1.0)
faraday (0.8.0)
multipart-post (~> 1.1)
@ -70,7 +59,7 @@ GEM
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.0)
json (1.6.6)
libv8 (3.3.10.4)
libxml-ruby (2.3.2)
mail (2.4.4)
@ -79,14 +68,19 @@ GEM
treetop (~> 1.4.8)
memcached (1.4.1)
mime-types (1.18)
multi_json (1.3.4)
multi_json (1.3.2)
multipart-post (1.1.5)
nokogiri (1.5.2)
oauth (0.4.6)
oauth2 (0.7.1)
oauth-plugin (0.4.0.1)
multi_json
oauth (~> 0.4.4)
oauth2 (>= 0.5.0)
rack
oauth2 (0.7.0)
faraday (~> 0.8)
httpauth (~> 0.1)
multi_json (~> 1.0)
multi_json (~> 1.3)
rack (~> 1.4)
open_id_authentication (1.1.0)
rack-openid (~> 1.3)
@ -137,7 +131,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sprockets (2.1.3)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@ -171,7 +165,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