fixes conflicts with master [#500]

spec/features/admin/comments_spec.rb

@@ -35,6 +35,7 @@ feature 'Admin comments' do
     expect(page).to_not have_content(comment.body)
 
     expect(comment.reload).to_not be_hidden
+    expect(comment).to be_ignored_flag
   end
 
   scenario "Confirm hide" do

spec/features/admin/debates_spec.rb

@@ -16,6 +16,7 @@ feature 'Admin debates' do
     expect(page).to_not have_content(debate.title)
 
     expect(debate.reload).to_not be_hidden
+    expect(debate).to be_ignored_flag
   end
 
   scenario 'Confirm hide' do

spec/features/admin/proposals_spec.rb

@@ -28,6 +28,7 @@ feature 'Admin proposals' do
     expect(page).to_not have_content(proposal.title)
 
     expect(proposal.reload).to_not be_hidden
+    expect(proposal).to be_ignored_flag
   end
 
   scenario 'Confirm hide' do