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

Use openstreetmap-oauth-plugin for now

Browse source
This commit is contained in:
Tom Hughes 2012-05-01 10:31:36 +01:00
parent 322c7061dc
commit ed8c76cba2
2 changed files with 14 additions and 14 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 'rails-i18n', ">= 0.6.3"
gem 'dynamic_form' gem 'dynamic_form'
gem 'rinku', '>= 1.2.2', :require => 'rails_rinku' gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
gem 'oauth-plugin', '>= 0.4.0.1' gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin'
gem 'open_id_authentication', '>= 1.1.0' gem 'open_id_authentication', '>= 1.1.0'
gem 'validates_email_format_of', '>= 1.5.1' gem 'validates_email_format_of', '>= 1.5.1'
gem 'composite_primary_keys', '>= 5.0.0' gem 'composite_primary_keys', '>= 5.0.0'

26
Gemfile.lock
View file

@ -44,7 +44,7 @@ GEM
deadlock_retry (1.2.0) deadlock_retry (1.2.0)
dynamic_form (1.1.4) dynamic_form (1.1.4)
erubis (2.7.0) erubis (2.7.0)
execjs (1.3.0) execjs (1.3.1)
multi_json (~> 1.0) multi_json (~> 1.0)
faraday (0.8.0) faraday (0.8.0)
multipart-post (~> 1.1) multipart-post (~> 1.1)
@ -59,7 +59,7 @@ GEM
jquery-rails (2.0.2) jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0) railties (>= 3.2.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
json (1.6.6) json (1.7.0)
libv8 (3.3.10.4) libv8 (3.3.10.4)
libxml-ruby (2.3.2) libxml-ruby (2.3.2)
mail (2.4.4) mail (2.4.4)
@ -68,22 +68,22 @@ GEM
treetop (~> 1.4.8) treetop (~> 1.4.8)
memcached (1.4.1) memcached (1.4.1)
mime-types (1.18) mime-types (1.18)
multi_json (1.3.2) multi_json (1.3.4)
multipart-post (1.1.5) multipart-post (1.1.5)
nokogiri (1.5.2) nokogiri (1.5.2)
oauth (0.4.6) oauth (0.4.6)
oauth-plugin (0.4.0.1) oauth2 (0.7.1)
faraday (~> 0.8)
httpauth (~> 0.1)
multi_json (~> 1.0)
rack (~> 1.4)
open_id_authentication (1.1.0)
rack-openid (~> 1.3)
openstreetmap-oauth-plugin (0.4.0.1)
multi_json multi_json
oauth (~> 0.4.4) oauth (~> 0.4.4)
oauth2 (>= 0.5.0) oauth2 (>= 0.5.0)
rack rack
oauth2 (0.7.0)
faraday (~> 0.8)
httpauth (~> 0.1)
multi_json (~> 1.3)
rack (~> 1.4)
open_id_authentication (1.1.0)
rack-openid (~> 1.3)
paperclip (2.7.0) paperclip (2.7.0)
activerecord (>= 2.3.0) activerecord (>= 2.3.0)
activesupport (>= 2.3.2) activesupport (>= 2.3.2)
@ -131,7 +131,7 @@ GEM
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
tilt (~> 1.3) tilt (~> 1.3)
sprockets (2.1.2) sprockets (2.1.3)
hike (~> 1.2) hike (~> 1.2)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
@ -165,8 +165,8 @@ DEPENDENCIES
jquery-rails jquery-rails
libxml-ruby (>= 2.0.5) libxml-ruby (>= 2.0.5)
memcached (>= 1.4.1) memcached (>= 1.4.1)
oauth-plugin (>= 0.4.0.1)
open_id_authentication (>= 1.1.0) open_id_authentication (>= 1.1.0)
openstreetmap-oauth-plugin (>= 0.4.0.1)
paperclip (~> 2.0) paperclip (~> 2.0)
pg pg
rails (= 3.2.3) rails (= 3.2.3)