Extra fixes.

xaviershay · Jan 23, 2013 · 51ce32d · 51ce32d
1 parent 73edfe8
commit 51ce32d
Show file tree

Hide file tree

Showing 3 changed files with 84 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ db/schema.rb
 .bundle
 *.log
 mysql2psql.yml
+config/secret_token
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,55 +4,6 @@ GEM
     RedCloth (4.2.9)
     RedCloth (4.2.9-java)
     aaronh-chronic (0.3.9)
-<<<<<<< HEAD
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.4)
-    builder (2.1.2)
-    coderay (0.9.5)
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    daemons (1.1.4)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    eventmachine (0.12.10)
-    factory_girl (1.3.2)
-    formtastic (1.2.0)
-      actionpack (>= 2.3.7)
-      activesupport (>= 2.3.7)
-=======
     actionmailer (3.2.11)
       actionpack (= 3.2.11)
       mail (~> 2.4.4)
@@ -74,105 +25,98 @@ GEM
       activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activerecord-jdbc-adapter (1.2.1)
-    activerecord-jdbcsqlite3-adapter (1.2.1)
-      activerecord-jdbc-adapter (~> 1.2.1)
+    activerecord-jdbc-adapter (1.2.5)
+    activerecord-jdbcsqlite3-adapter (1.2.5)
+      activerecord-jdbc-adapter (~> 1.2.5)
       jdbc-sqlite3 (~> 3.7.2)
     activeresource (3.2.11)
       activemodel (= 3.2.11)
       activesupport (= 3.2.11)
     activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.6)
+    addressable (2.3.2)
     arel (3.0.2)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.4)
-    capybara (1.1.2)
+    capybara (2.0.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.0)
-      ffi (~> 1.0.6)
-    coderay (1.0.5)
-    cucumber (1.1.4)
+      xpath (~> 1.0.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    coderay (1.0.8)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.7.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.1)
+    cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.3)
+      cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
-    cucumber-websteps (0.9.0)
-      capybara
-      cucumber
+    cucumber-websteps (0.10.0)
+      capybara (>= 1.1.2)
+      cucumber (>= 1.1.1)
       launchy
-    database_cleaner (0.7.0)
+    daemons (1.1.9)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
+    eventmachine (1.0.0)
+    eventmachine (1.0.0-java)
     exception_notification (2.5.2)
       actionmailer (>= 3.0.4)
-    factory_girl (2.4.2)
-      activesupport
-    ffi (1.0.11)
-    ffi (1.0.11-java)
+    factory_girl (4.2.0)
+      activesupport (>= 3.0.0)
+    ffi (1.1.5)
+    ffi (1.1.5-java)
     formtastic (2.2.1)
       actionpack (>= 3.0)
-    gherkin (2.7.3)
+    gherkin (2.11.5)
       json (>= 1.4.6)
-    gherkin (2.7.3-java)
+    gherkin (2.11.5-java)
       json (>= 1.4.6)
     hike (1.2.1)
+    hpricot (0.8.6)
+    hpricot (0.8.6-java)
     i18n (0.6.1)
     jdbc-sqlite3 (3.7.2)
     journey (1.0.4)
-    jquery-rails (2.1.1)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    jruby-openssl (0.7.4)
-      bouncy-castle-java
-    jruby-rack (1.1.3)
+    jquery-rails (2.2.0)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jruby-openssl (0.8.2)
+      bouncy-castle-java (>= 1.5.0146.1)
+    jruby-rack (1.1.13.1)
     json (1.7.6)
     json (1.7.6-java)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    launchy (2.0.5-java)
-      addressable (~> 2.2.6)
-      ffi (~> 1.0.9)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    launchy (2.1.2-java)
+      addressable (~> 2.3)
+      ffi (~> 1.1.1)
       spoon (~> 0.0.1)
-    lesstile (1.0.1)
+    lesstile (1.1.0)
     mail (2.4.4)
->>>>>>> 2d0d06c0ff295791c860d573de6ae1671710e05a
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-<<<<<<< HEAD
-    mime-types (1.16)
-    nokogiri (1.4.4)
-    pg (0.11.0)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-openid (1.2.0)
-=======
     mime-types (1.19)
-    multi_json (1.0.4)
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
+    multi_json (1.5.0)
+    nokogiri (1.5.6)
+    nokogiri (1.5.6-java)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
+    pg (0.14.1)
     polyglot (0.3.3)
-    rack (1.4.3)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-openid (1.3.1)
->>>>>>> 2d0d06c0ff295791c860d573de6ae1671710e05a
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
@@ -197,66 +141,62 @@ GEM
     rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.1)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.8.0)
-    ruby-openid (2.1.8)
-<<<<<<< HEAD
-    silent-postgres (0.0.8)
-    term-ansicolor (1.0.5)
-    thin (1.2.11)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.14.4)
-    treetop (1.4.9)
-=======
-    rubyzip (0.9.5)
-    sass (3.1.12)
-    sass-rails (3.2.3)
-      railties (~> 3.2.0.beta)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    ruby-openid (2.2.2)
+    rubyzip (0.9.9)
+    sass (3.2.5)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.17.0)
+    selenium-webdriver (2.29.0)
       childprocess (>= 0.2.5)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+      multi_json (~> 1.0)
       rubyzip
+      websocket (~> 1.0.4)
+    silent-postgres (0.1.1)
     spoon (0.0.1)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    term-ansicolor (1.0.7)
+    sqlite3 (1.3.7)
+    thin (1.5.0)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
->>>>>>> 2d0d06c0ff295791c860d573de6ae1671710e05a
       polyglot (>= 0.3.1)
-    trinidad (1.3.2)
-      jruby-rack (>= 1.1.1)
-      trinidad_jars (>= 1.0.1)
-    trinidad_jars (1.0.2)
+    trinidad (1.4.4)
+      jruby-rack (>= 1.1.10)
+      trinidad_jars (>= 1.1.0)
+    trinidad_jars (1.2.0)
     tzinfo (0.3.35)
     webrat (0.7.3)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    will_paginate (3.0.2)
-    xpath (0.1.4)
+    websocket (1.0.6)
+    will_paginate (3.0.4)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -274,27 +214,22 @@ DEPENDENCIES
   exception_notification (~> 2.5.2)
   factory_girl
   formtastic
+  hpricot
   jquery-rails
   jruby-openssl
   lesstile
-<<<<<<< HEAD
-  pg
-=======
   nokogiri (~> 1.5.0)
   open_id_authentication
->>>>>>> 2d0d06c0ff295791c860d573de6ae1671710e05a
+  pg
   rack-openid
   rails (~> 3.2)
   rspec
   rspec-rails
   ruby-openid
-<<<<<<< HEAD
-  silent-postgres
-  thin
-=======
   sass-rails (~> 3.2.3)
+  silent-postgres
   sqlite3
+  thin
   trinidad
->>>>>>> 2d0d06c0ff295791c860d573de6ae1671710e05a
   webrat
   will_paginate (~> 3.0.2)
diff --git a/config/initializers/open_id_logger.rb b/config/initializers/open_id_logger.rb