Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Discuss Data Project
Discuss Data
Commits
23b50643
Commit
23b50643
authored
Jun 04, 2020
by
hynek
🤤
Browse files
fix(migrations): resolve conflict in ddcomments and merge dddatasets, ddusers
parent
6a249c5c
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
discuss_data/dd
commen
ts/migrations/00
24_auto
_2020060
1_0927
.py
→
discuss_data/dd
datase
ts/migrations/00
16_merge
_2020060
4_1336
.py
View file @
23b50643
# Generated by Django 2.2.12 on 2020-06-0
1 09:27
# Generated by Django 2.2.12 on 2020-06-0
4 13:36
from
django.db
import
migrations
import
django_bleach.models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'ddcomments'
,
'0023_comment_deleted'
),
(
'dddatasets'
,
'0015_auto_20200524_1509'
),
(
'dddatasets'
,
'0015_auto_20200602_1001'
),
(
'dddatasets'
,
'0015_datasetaccessrequest'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'notification'
,
name
=
'text'
,
field
=
django_bleach
.
models
.
BleachField
(
max_length
=
400
),
),
]
discuss_data/ddusers/migrations/0005_merge_20200604_1335.py
0 → 100644
View file @
23b50643
# Generated by Django 2.2.12 on 2020-06-04 13:35
from
django.db
import
migrations
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'ddusers'
,
'0004_auto_20200602_0952'
),
(
'ddusers'
,
'0004_project_description'
),
]
operations
=
[
]
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment