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

Update to version 5.0.8 of composite_primary_keys

Browse source
This commit is contained in:
Tom Hughes 2012-07-02 08:50:33 +01:00
parent 58583283d8
commit c8fd34b178
2 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -20,7 +20,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin'
gem 'open_id_authentication', '>= 1.1.0'
gem 'validates_email_format_of', '>= 1.5.1'
gem 'composite_primary_keys', '= 5.0.4'
gem 'composite_primary_keys', '>= 5.0.8'
gem 'http_accept_language', '>= 1.0.2'
gem 'paperclip', '~> 2.0'
gem 'deadlock_retry', '>= 1.2.0'

29
Gemfile.lock
View file

@ -41,7 +41,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.3)
composite_primary_keys (5.0.4)
composite_primary_keys (5.0.8)
activerecord (~> 3.2.0)
deadlock_retry (1.2.0)
dynamic_form (1.1.4)
@ -62,24 +62,27 @@ GEM
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
json (1.7.3)
jwt (0.1.4)
json (>= 1.2.4)
libv8 (3.3.10.4)
libxml-ruby (2.3.2)
libxml-ruby (2.3.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
memcached (1.4.2)
mime-types (1.18)
minitest (3.1.0)
mime-types (1.19)
minitest (3.2.0)
multi_json (1.3.6)
multipart-post (1.1.5)
nokogiri (1.5.4)
nokogiri (1.5.5)
oauth (0.4.6)
oauth2 (0.7.1)
oauth2 (0.8.0)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.4)
rack (~> 1.2)
open_id_authentication (1.1.0)
rack-openid (~> 1.3)
openstreetmap-oauth-plugin (0.4.0.1)
@ -92,7 +95,7 @@ GEM
activesupport (>= 2.3.2)
cocaine (>= 0.0.2)
mime-types
pg (0.13.2)
pg (0.14.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@ -129,7 +132,7 @@ GEM
ruby-openid (2.1.8)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
sass (3.1.19)
sass (3.1.20)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@ -140,16 +143,16 @@ GEM
tilt (~> 1.1, != 1.3.0)
therubyracer (0.10.1)
libv8 (~> 3.3.10)
thor (0.15.2)
thor (0.15.4)
tilt (1.3.3)
timecop (0.3.5)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.33)
uglifier (1.2.4)
uglifier (1.2.6)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
multi_json (~> 1.3)
validates_email_format_of (1.5.3)
PLATFORMS
@ -160,7 +163,7 @@ DEPENDENCIES
bigdecimal
browser
coffee-rails (~> 3.2.1)
composite_primary_keys (= 5.0.4)
composite_primary_keys (>= 5.0.8)
deadlock_retry (>= 1.2.0)
dynamic_form
htmlentities