Merge branch 'master' into close-accounts

2013-05-16 14:16:47 -07:00
parent a25242f68d da197bb659
commit 7db85d8301
129 changed files with 55250 additions and 462 deletions
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -71,7 +71,7 @@ class UserTest < ActiveSupport::TestCase
        assert_difference("ModAction.count") do
          @user.invite!(User::Levels::CONTRIBUTOR)
        end
-        assert_equal("#{@user.name} level changed Member -> Contributor by #{CurrentUser.name}", ModAction.last.description)
+        assert_equal(%{"#{@user.name}":/users/#{@user.id} level changed Member -> Contributor}, ModAction.last.description)
      end
    end