Skip to content

Develop -> hotfixes#2767

Merged
rtibbles merged 3577 commits intohotfixesfrom
develop
Jan 13, 2021
Merged

Develop -> hotfixes#2767
rtibbles merged 3577 commits intohotfixesfrom
develop

Conversation

@jayoshih
Copy link
Copy Markdown
Contributor

No description provided.

micahscopes and others added 30 commits December 9, 2020 19:23
Pass selected trash nodes into `MoveModal` `moveNodeIds` prop
Ensure `rev` is only set on changes when it needs to be
Navigate out of active views when deleting topics or resources
Don't commit disk space updates to indexeddb sync changes
…use-tuple-id

Use `contentnode_id`/`assessment_id` tuple in assessment item serializers
…into staging-diff

# Conflicts:
#	contentcuration/contentcuration/tasks.py
Revert "Add a uniqueness constraint on contentnode/assessment_id pair"
Added timing logs to mark_incomplete command
Add guard to `TreeView` `created` hook, to prevent data over-fetching
Re-add newrelic integration to studio
jayoshih and others added 27 commits January 12, 2021 15:55
Make sure we recalculate user storage on updates
Reinstates move as an async task
Updated admin page emails to allow emailing all users that match query
Fixed French translations on CountryField
Do not risk unfinished call and thus inconsistent
data state.
Run sync before publishing a channel
Fixes for syncing invitation updates between sender and invited user
Updated model cascade deletion settings
Added logs to duplicate_assessment_items command
Add test to ensure that nodes can be saved with null complete.
Copy link
Copy Markdown
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is the right fix for this issue.

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 13, 2021

Codecov Report

Merging #2767 (0fac4b1) into hotfixes (28587f8) will increase coverage by 4.12%.
The diff coverage is 88.73%.

Impacted file tree graph

@@             Coverage Diff              @@
##           hotfixes    #2767      +/-   ##
============================================
+ Coverage     80.80%   84.92%   +4.12%     
============================================
  Files           281      309      +28     
  Lines         12659    15346    +2687     
============================================
+ Hits          10229    13033    +2804     
+ Misses         2430     2313     -117     
Impacted Files Coverage Δ
contentcuration/contentcuration/decorators.py 56.60% <50.00%> (-37.60%) ⬇️
contentcuration/contentcuration/forms.py 69.06% <72.41%> (+20.61%) ⬆️
...ntentcuration/contentcuration/db/models/manager.py 93.49% <93.33%> (-6.51%) ⬇️
contentcuration/contentcuration/api.py 92.06% <100.00%> (+1.43%) ⬆️
...tentcuration/contentcuration/context_processors.py 100.00% <100.00%> (ø)
...tcuration/contentcuration/db/models/expressions.py 93.33% <100.00%> (-6.67%) ⬇️
...entcuration/contentcuration/db/models/functions.py 100.00% <100.00%> (ø)
...ation/contentcuration/tests/test_rest_framework.py 36.93% <0.00%> (-63.07%) ⬇️
contentcuration/contentcuration/utils/format.py 21.05% <0.00%> (-49.54%) ⬇️
contentcuration/contentcuration/utils/cache.py 31.70% <0.00%> (-31.93%) ⬇️
... and 190 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 62d7c8e...0fac4b1. Read the comment docs.

@rtibbles rtibbles merged commit eb18e48 into hotfixes Jan 13, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.