Commit Graph

2 Commits

Author SHA1 Message Date
Cody Cutrer 884534ffa5 Rails 5: fix Rails version migration deprecation warning
also pins all migrations to Rails 4.2 semantics

Change-Id: I386566f7a1f3e3e8aa31675f467c87c443457aee
Reviewed-on: https://gerrit.instructure.com/95571
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Simon Williams <simon@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
2016-11-17 23:46:22 +00:00
Rob Orton 66251f94d2 don't allow a user to observe oneself
fixes CNVS-18980

test plan
 - attempting to observe yourself should throw an error
 - attempting to add an observer enrollment where user_id
   is equal to the associated_user_id should throw an
   error
 - merging two users that would result in self observing
   should delete user observers
 - merging two users that would result in enrollments
   with user_id = associated_user_id should be marked
   as deleted and not moved
 - enrollments in this state should be removed
 - user observers in this state should be removed

Change-Id: I308bf474406a60b81550c21cefcab323ed0850db
Reviewed-on: https://gerrit.instructure.com/49759
Tested-by: Jenkins
Reviewed-by: Jacob Fugal <jacob@instructure.com>
QA-Review: Clare Strong <clare@instructure.com>
QA-Review: August Thornton <august@instructure.com>
Product-Review: Rob Orton <rob@instructure.com>
2015-03-19 20:46:07 +00:00