2 Commits

Author	SHA1	Message	Date
Cody Cutrer	b7b5042b2c	rename transaction attribute to disable_ddl_migration! ... for Rails 4 compatibility Change-Id: I7dd48ef8cce10e9e15536eebf3e4ab5aee365a40 Reviewed-on: https://gerrit.instructure.com/25686 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Brian Palmer <brianp@instructure.com> Product-Review: Cody Cutrer <cody@instructure.com> QA-Review: Cody Cutrer <cody@instructure.com>	2013-10-29 20:33:53 +00:00
Jon Jensen	85f06a4e50	include attachments et al w/ forwarded messages, fixes #5371 ... adds bools to ConversationMessage to track if there are any attachments or media comments. this differs from the existing columns in that it includes forwarded messages as well fix UI so that we properly display attachments/media comments in forwarded messages (already present in JSON, just a display issue) test plan: 1. start a conversation with a user 2. send an attachment 3. send a media comment 4. forward the attachment message to a different user 5. the attachment should be displayed and the conversation should have an attachment indicator icon 6. forward the media comment message to a different user 7. the media comment should be displayed and the conversation should have a media comment indicator icon Change-Id: I5136a7e36db97046635af956153a0d0347071413 Reviewed-on: https://gerrit.instructure.com/12011 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Joe Tanner <joe@instructure.com>	2012-07-06 08:15:09 -06:00