Merge branch 'master' of github.com:discourse/discourse

2025-06-06 03:06:53 +08:00 · 2015-07-23 07:48:55 +10:00
parent 3a54923116 8c4cd511cc
commit 53b1d89f96
53 changed files with 614 additions and 242 deletions
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@ -258,7 +258,6 @@ describe TopicsController do
        t2.reload
        p3.reload
        expect(t2.deleted_at).to be_nil
-        expect(p3.deleted_at).to be_nil
        expect(p3.user).to eq(user_a)
      end
    end