Merge remote-tracking branch 'upstream/pull/5699'

[rails.git] / app / views / api / user_blocks / _user_block.xml.builder

diff --git a/app/views/api/user_blocks/_user_block.xml.builder b/app/views/api/user_blocks/_user_block.xml.builder
index a41dc56d7f4d20a4891833749d8bca9380c46a7b..288e8966363341b36ac2c37418ce1575a9f8522b 100644 (file)
--- a/app/views/api/user_blocks/_user_block.xml.builder
+++ b/app/views/api/user_blocks/_user_block.xml.builder
@@ -10,5 +10,6 @@ xml.user_block(attrs) do
   xml.user :uid => user_block.user_id, :user => user_block.user.display_name
   xml.creator :uid => user_block.creator_id, :user => user_block.creator.display_name
   xml.revoker :uid => user_block.revoker_id, :user => user_block.revoker.display_name if user_block.revoker
   xml.user :uid => user_block.user_id, :user => user_block.user.display_name
   xml.creator :uid => user_block.creator_id, :user => user_block.creator.display_name
   xml.revoker :uid => user_block.revoker_id, :user => user_block.revoker.display_name if user_block.revoker

-  xml.reason user_block.reason
+
+  xml.reason user_block.reason unless @skip_reason

 end
 end