search

kartoza / prj.app

A django app for creating visual changelogs for software releases
29 stars 32 forks source link

fix migrations conflict #1285

Closed sumandari closed 3 years ago

sumandari commented 3 years ago

This PR fixes the migrations conflict after PR merged.

image

codecov[bot] commented 3 years ago

Codecov Report

Merging #1285 (3088d68) into develop (12cbd64) will decrease coverage by 0.14%. The diff coverage is 44.77%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1285      +/-   ##
===========================================
- Coverage    62.70%   62.55%   -0.15%     
===========================================
  Files          176      177       +1     
  Lines         9270     9332      +62     
  Branches       700      706       +6     
===========================================
+ Hits          5813     5838      +25     
- Misses        3242     3278      +36     
- Partials       215      216       +1
Impacted Files Coverage Δ
django_project/core/settings/contrib.py 100.00% <ø> (ø)
django_project/lesson/urls.py 86.66% <ø> (ø)
django_project/changes/utils/svgimagefile.py 33.33% <33.33%> (ø)
django_project/lesson/views/worksheet.py 73.81% <40.00%> (-1.96%) :arrow_down:
django_project/changes/forms.py 89.93% <100.00%> (+0.12%) :arrow_up:
django_project/core/settings/project.py 100.00% <100.00%> (ø)
django_project/core/urls.py 77.27% <100.00%> (+1.08%) :arrow_up:
django_project/lesson/admin.py 100.00% <100.00%> (ø)
django_project/lesson/forms/further_reading.py 57.69% <100.00%> (+5.51%) :arrow_up:
django_project/lesson/models/further_reading.py 94.44% <100.00%> (-0.30%) :arrow_down:
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 83f7dd9...3088d68. Read the comment docs.

dimasciput commented 3 years ago

@sumandari LGTM, please add tests in another PR