diff options
| author |  Sebastiaan Zeeff <[email protected]> | 2019-10-18 12:52:11 +0200 |
|---|---|---|
| committer | Sebastiaan Zeeff <[email protected]> | 2019-10-18 12:52:11 +0200 |
| commit | e415428386caae19aa0398aea66ee5053569abcf (patch) | |
| tree | aa3caca500f85cfc8ef5a5e10147a6d3e30fe699 /pydis_site/apps/api/tests/migrations | |
| parent | Merge branch 'master' into active-infractions-validation (diff) | |
Solve migration conflict by renaming migrations
The migration files were generated and named before the migrations
added by other pull requests. This caused the migration path to
diverge. Since the migrations did not touch the same models, the
solution was to rename the migration files to place them at the end
of the migration history.
Diffstat (limited to 'pydis_site/apps/api/tests/migrations')
| -rw-r--r-- | pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py b/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py index cfae4219..61574b7e 100644 --- a/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py +++ b/pydis_site/apps/api/tests/migrations/test_active_infraction_migration.py @@ -81,8 +81,8 @@ class InfractionFactoryTests(MigrationsTestCase): """Tests for the InfractionFactory.""" app = "api" - migration_prior = "0043_infraction_hidden_warnings_to_notes" - migration_target = "0043_infraction_hidden_warnings_to_notes" + migration_prior = "0045_add_plural_name_for_log_entry" + migration_target = "0045_add_plural_name_for_log_entry" @classmethod def setUpPostMigrationData(cls, apps): @@ -183,8 +183,8 @@ class ActiveInfractionMigrationTests(MigrationsTestCase): """ app = "api" - migration_prior = "0043_infraction_hidden_warnings_to_notes" - migration_target = "0044_active_infractions_migration" + migration_prior = "0045_add_plural_name_for_log_entry" + migration_target = "0046_active_infractions_migration" @classmethod def setUpMigrationData(cls, apps): |