using shoulda-matchers from original repository

Gemfile

@@ -30,7 +30,7 @@ group :test, :development do
 end
 
 group :test do
-  gem "shoulda-matchers", :git => "git://github.com/morgoth/shoulda-matchers.git", :branch => "mass-assigment-fix-for-empty-attr-accessible"
+  gem "shoulda-matchers", :git => "git://github.com/thoughtbot/shoulda-matchers.git"
   gem "selenium-webdriver"
   gem "factory_girl_rails"
   gem "database_cleaner"

Gemfile.lock

@@ -7,9 +7,8 @@ GIT
       ya2yaml (~> 0.26)
 
 GIT
-  remote: git://github.com/morgoth/shoulda-matchers.git
-  revision: 9347fe8009865520009c98789bac3d940cf9b68e
-  branch: mass-assigment-fix-for-empty-attr-accessible
+  remote: git://github.com/thoughtbot/shoulda-matchers.git
+  revision: a922b8ec38b65ae3274f194e90eaff6ac642d0b1
   specs:
     shoulda-matchers (1.0.0.beta3)
 
@@ -74,12 +73,10 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    daemons (1.1.4)
     database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    eventmachine (0.12.10)
     factory_girl (1.3.3)
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
@@ -127,6 +124,7 @@ GEM
       roodi (>= 2.1.0)
       syntax
     mime-types (1.16)
+    mysql2 (0.2.11)
     nifty-generators (0.4.6)
     nokogiri (1.4.6)
     polyglot (0.3.1)
@@ -164,7 +162,7 @@ GEM
     rbx-require-relative (0.0.5)
     rcov (0.9.9)
     rdiscount (1.6.8)
-    rdoc (3.6.1)
+    rdoc (3.7)
     redis (2.2.1)
     reek (1.2.8)
       ruby2ruby (~> 1.2)
@@ -211,14 +209,10 @@ GEM
     sqlite3 (1.3.3)
     state_machine (1.0.1)
     syntax (1.0.0)
-    thin (1.2.11)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
+    tzinfo (0.3.29)
     will_paginate (3.0.pre2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -240,6 +234,7 @@ DEPENDENCIES
   haml
   hiredis
   metric_fu
+  mysql2 (~> 0.2.7)
   nifty-generators
   rack-sprockets
   rails (~> 3.0.9)
@@ -254,6 +249,5 @@ DEPENDENCIES
   shoulda-matchers!
   sqlite3
   state_machine
-  thin
   tolk!
   will_paginate (~> 3.0.pre2)

app/stylesheets/partials/_supervision.sass

@@ -62,7 +62,7 @@
     margin-top: 5px
     padding-left: 80px
 
-#supervisions_show, #topics_index
+#supervisions_show
   .content
     padding-bottom: 1em
     padding-right: 1em
@@ -186,4 +186,3 @@
   .list
     .topic
       +supervision-item-small
-

spec/models/supervision_spec.rb

@@ -332,7 +332,7 @@
   describe "#supervision_publish_attributed" do
     it "should have only known options" do
       @supervision = Supervision.new
-      @supervision.send(:supervision_publish_attributes).should be == {:only => [:id, :state, :topic_id]}
+      @supervision.send(:supervision_publish_attributes).should be == {:methods => :topic_user_id, :only => [:id, :state, :topic_id]}
     end
   end