Merge branch 'master' into 66-ruby-1.9.3

Conflicts:
	.rvmrc

.autotest

@@ -2,6 +2,7 @@ require 'autotest/bundler'
 
 Autotest.add_hook :initialize do |at|
   at.add_exception '.git'
+  at.add_exception '.redcar'
   at.add_exception 'spec-results/index.html'
   at.add_exception 'features_report.html'
   at.add_exception /capybara-\d+\.html$/

.gitignore

@@ -9,4 +9,5 @@ features_report.html
 config/config.yml
 config/deploy.rb
 config/database.yml
+.redcar
 *~

.rspec.travis

@@ -0,0 +1,2 @@
+--colour
+--format progress

.ruby-gemset

@@ -0,0 +1 @@
+quorum2

.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.2-p320

.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 1.9.3
+bundler_args: --without development
+services: postgresql
+before_install:
+  - gem update --system 1.8.25 # since ZenTest needs ~> 1.8
+  - gem --version
+before_script: ./ci/before_script.sh
+script: rake ci

CHANGELOG.md

@@ -36,4 +36,45 @@ Quorum is distributed under the [BSD 3-Clause License](http://www.opensource.org
 
 ## v0.3.8, 23 September 2011
 * Replace many controller specs with Cucumber stories [#54]
-* Deal better with HTML escaping
+* Deal better with HTML escaping
+
+## v0.3.9, 28 December 2011
+* Fix iCal export issues: we were exporting an invalid iCalendar file [#65]
+
+## v0.4.0, 29 December 2011
+* Remove make_resourceful now that Rails offers `respond_with` [#64]
+
+## v0.5.0, 12 March 2012
+* Add the ability to make comments on one's commitment status [#69]
+
+## v0.5.1, 12 March 2012
+* Fix invalid HTML on event list [#71]
+
+## v0.5.2, 12 March 2012
+* Autolink URLs in event descriptions [#75]
+
+## v0.5.3, 13 March 2012
+* Show commitment status icons on comments [#74]
+
+## v0.5.4, 13 March 2012
+* Bugfix.
+
+## v0.5.5, 2 July 2012
+* Put event comments on separate lines [#77]
+* Add application information in footer [#79]
+
+## v0.5.6, v0.5.7, 2 July 2012
+* Bugfix.
+
+## v0.5.8, 2 July 2012
+* Put attendance icons in "attending" and "not attending" columns [#81]
+
+## v0.5.9, 30 January 2013
+* Update to Rails 3.0.20 to patch security hole
+
+## v0.5.10, 5 August 2013
+* Make some configuration changes for Passenger
+* Remove YM4R and Spatial Adapter, since neither is currently supported [#82, #86]
+
+## v0.5.11, 23 October 2013
+* Add patch for ActionMailer vulnerability at http://seclists.org/oss-sec/2013/q4/118 [#88]

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.10'
+gem 'rails', '3.0.20'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -26,8 +26,10 @@ gem 'sass'
 gem 'pg'
 gem 'gettext_i18n_rails'
 gem 'prawn'
-gem 'GeoRuby'
+gem 'geocoder', '~> 1.1.8'
 gem 'rdiscount'
+gem 'rgeo-activerecord', github: 'marnen/rgeo-activerecord', branch: 'fix-proc-error-in-default-factory' # TODO: waiting for https://github.com/dazuma/rgeo-activerecord/pull/10
+gem 'activerecord-postgis-adapter'
 gem 'authlogic', '~> 3.0.3'
 gem 'dynamic_form'
 gem 'exception_notification'
@@ -40,14 +42,14 @@ gem 'exception_notification'
 # end
 
 group :development do
-  gem 'capistrano'
+  gem 'rvm-capistrano'
   gem 'gettext', '>= 1.9.3', :require => false
+  gem 'ruby-debug19'
 end
 
 group :test, :development do
-  gem 'ruby-debug19'
   gem 'autotest-rails', :require => false
-  gem 'rspec-rails', '~> 2.6.1', :require => false
+  gem 'rspec-rails', '~> 2.11.0', :require => false
   gem 'test-unit', '1.2.3', :require => false # amazingly, RSpec needs this
   gem 'cucumber-rails', :require => false
   gem 'launchy'

Gemfile.lock

@@ -1,35 +1,46 @@
+GIT
+  remote: git://github.com/marnen/rgeo-activerecord.git
+  revision: 26bd2daa1650b35643a3f0aef9ae82186bf1556b
+  branch: fix-proc-error-in-default-factory
+  specs:
+    rgeo-activerecord (0.5.0)
+      activerecord (>= 3.0.3)
+      arel (>= 2.0.6)
+      rgeo (>= 0.3.20)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    GeoRuby (1.3.3)
     ZenTest (4.6.2)
     abstract (1.0.0)
-    actionmailer (3.0.10)
-      actionpack (= 3.0.10)
+    actionmailer (3.0.20)
+      actionpack (= 3.0.20)
       mail (~> 2.2.19)
-    actionpack (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
+    actionpack (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
-      rack (~> 1.2.1)
+      rack (~> 1.2.5)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.10)
-      activesupport (= 3.0.10)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
+    activerecord (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.10)
-      activemodel (= 3.0.10)
-      activesupport (= 3.0.10)
-    activesupport (3.0.10)
+    activerecord-postgis-adapter (0.6.5)
+      rgeo-activerecord (~> 0.5.0)
+    activeresource (3.0.20)
+      activemodel (= 3.0.20)
+      activesupport (= 3.0.20)
+    activesupport (3.0.20)
     addressable (2.2.6)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
@@ -39,7 +50,7 @@ GEM
     autotest-rails (4.1.0)
       ZenTest
     builder (2.1.2)
-    capistrano (2.8.0)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -65,31 +76,33 @@ GEM
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
       nokogiri (>= 1.4.6)
-    database_cleaner (0.6.7)
+    database_cleaner (1.1.1)
     diff-lcs (1.1.3)
     dynamic_form (1.1.4)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     exception_notification (2.5.2)
       actionmailer (>= 3.0.4)
-    factory_girl (2.1.0)
-    factory_girl_rails (1.2.0)
-      factory_girl (~> 2.1.0)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
     fast_gettext (0.5.13)
     ffaker (1.8.1)
     ffi (1.0.9)
+    geocoder (1.1.8)
     gettext (2.0.0)
     gettext_i18n_rails (0.2.20)
       fast_gettext
     gherkin (2.4.16)
       json (>= 1.4.6)
     haml (3.0.25)
-    highline (1.6.2)
-    hoe (2.12.3)
-      rake (~> 0.8)
+    highline (1.6.19)
+    hoe (3.5.0)
+      rake (>= 0.8, < 11.0)
     i18n (0.5.0)
-    json (1.5.4)
+    json (1.8.0)
     json_pure (1.5.4)
       spruz (~> 0.2.8)
     launchy (2.0.5)
@@ -101,58 +114,60 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.16)
-    net-scp (1.0.4)
-      net-ssh (>= 1.99.1)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
-    net-ssh (2.2.1)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
+    mime-types (1.19)
+    net-scp (1.1.2)
+      net-ssh (>= 2.6.5)
+    net-sftp (2.1.2)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.6.8)
+    net-ssh-gateway (1.2.0)
+      net-ssh (>= 2.6.5)
     nokogiri (1.5.0)
     pg (0.11.0)
     pickle (0.4.8)
       cucumber (>= 0.8)
       rake
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     prawn (0.4.0)
       prawn-layout
     prawn-layout (0.1.0)
-    rack (1.2.3)
+    rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.10)
-      actionmailer (= 3.0.10)
-      actionpack (= 3.0.10)
-      activerecord (= 3.0.10)
-      activeresource (= 3.0.10)
-      activesupport (= 3.0.10)
+    rails (3.0.20)
+      actionmailer (= 3.0.20)
+      actionpack (= 3.0.20)
+      activerecord (= 3.0.20)
+      activeresource (= 3.0.20)
+      activesupport (= 3.0.20)
       bundler (~> 1.0)
-      railties (= 3.0.10)
-    railties (3.0.10)
-      actionpack (= 3.0.10)
-      activesupport (= 3.0.10)
+      railties (= 3.0.20)
+    railties (3.0.20)
+      actionpack (= 3.0.20)
+      activesupport (= 3.0.20)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (10.1.0)
     rdiscount (1.6.8)
-    rdoc (3.9.4)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    rspec-rails (2.6.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.6.0)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rgeo (0.3.20)
+    rspec (2.11.0)
+      rspec-core (~> 2.11.0)
+      rspec-expectations (~> 2.11.0)
+      rspec-mocks (~> 2.11.0)
+    rspec-core (2.11.1)
+    rspec-expectations (2.11.3)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.11.3)
+    rspec-rails (2.11.4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.11.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -164,7 +179,9 @@ GEM
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
     rubyzip (0.9.4)
-    sass (3.1.7)
+    rvm-capistrano (1.3.0)
+      capistrano (>= 2.0.0)
+    sass (3.1.15)
     selenium-webdriver (2.5.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
@@ -175,37 +192,39 @@ GEM
     test-unit (1.2.3)
       hoe (>= 1.5.1)
     thor (0.14.6)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.37)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  GeoRuby
+  activerecord-postgis-adapter
   authlogic (~> 3.0.3)
   autotest-rails
-  capistrano
   cucumber-rails
   database_cleaner
   dynamic_form
   exception_notification
   factory_girl_rails
   ffaker
+  geocoder (~> 1.1.8)
   gettext (>= 1.9.3)
   gettext_i18n_rails
   haml
   launchy
   pg
   pickle
   prawn
-  rails (= 3.0.10)
+  rails (= 3.0.20)
   rdiscount
-  rspec-rails (~> 2.6.1)
+  rgeo-activerecord!
+  rspec-rails (~> 2.11.0)
   ruby-debug19
+  rvm-capistrano
   sass
   test-unit (= 1.2.3)