diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b9020e1..dcf03168 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -120,3 +120,11 @@ Don't forget to run migrations, several settings previously in the `preferences` in their own Payment models. To have a closer look on how the payments works, please go to the wiki. + +## MR xxx: Add role models + +Adds the Role model. +You need to ensure that your database character set is utf-8. +```sql +ALTER DATABASE re2o CHARACTER SET utf8; +``` diff --git a/machines/migrations/0083_role.py b/machines/migrations/0084_role.py similarity index 93% rename from machines/migrations/0083_role.py rename to machines/migrations/0084_role.py index 7609a5ac..bb113813 100644 --- a/machines/migrations/0083_role.py +++ b/machines/migrations/0084_role.py @@ -9,7 +9,7 @@ import re2o.mixins class Migration(migrations.Migration): dependencies = [ - ('machines', '0082_auto_20180621_1524'), + ('machines', '0083_remove_duplicate_rights'), ] operations = [ diff --git a/machines/migrations/0094_role_specific_role.py b/machines/migrations/0085_role_specific_role.py similarity index 94% rename from machines/migrations/0094_role_specific_role.py rename to machines/migrations/0085_role_specific_role.py index 73cade7b..d861f45b 100644 --- a/machines/migrations/0094_role_specific_role.py +++ b/machines/migrations/0085_role_specific_role.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('machines', '0093_merge_20180710_0226'), + ('machines', '0084_role'), ] operations = [