Skip to content

Master into develop - #2834

Merged
rtibbles merged 79 commits into
learningequality:developfrom
rtibbles:master_into_develop
Jan 20, 2021
Merged

Master into develop#2834
rtibbles merged 79 commits into
learningequality:developfrom
rtibbles:master_into_develop

Conversation

@rtibbles

Copy link
Copy Markdown
Member

Replaces #2778

Aron Asorand others added 30 commits January 13, 2021 08:18
This ensures we run the workers on a node that has full GCP access scope
Temporary while I figure out how to convince helm not to overwrite the number of replicas
…ng-commands
Add in K8s jobs for some common data cleaning commands
Fixed issue where creating a channel could open the sharing tab
…k-filter
Consolidate task filter for channel
MisRoband others added 26 commits January 15, 2021 10:00
Fixed issue where creating a new node was causing drawer to disappear
…tion
Validate channel modal automatically on existing channels
Reinstate copyright holder check.
Filter by complete=False.
Separate out exercises checks.
Separate out different categories of incomplete.
Added checks for existing long-running tasks on publish
…rkers
Set the default number of worker pods to 5
…not_type
Correct complete setting for exercises.
Switched type to mastery_model on extra_fields
# Conflicts:
#	contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
@codecov

codecovBot commented Jan 19, 2021

Copy link
Copy Markdown

Codecov Report

Merging #2834 (950e24f) into develop (4ca5990) will decrease coverage by 0.09%.
The diff coverage is 89.18%.

Impacted file tree graph

@@ Coverage Diff @@## develop #2834 +/- ##
===========================================
- Coverage 84.94% 84.85% -0.10% 
===========================================
Files 309 292 -17 Lines 15367 15338 -29 ===========================================
- Hits 13054 13015 -39 - Misses 2313 2323 +10 
Impacted FilesCoverage Δ
.../migrations/0116_index_channel_contentnode_file.py100.00% <ø> (ø)
...entcuration/migrations/0117_assessment_id_index.py100.00% <ø> (ø)
...contentcuration/migrations/0119_task_channel_id.py100.00% <ø> (ø)
contentcuration/contentcuration/utils/db_tools.py69.75% <ø> (ø)
contentcuration/contentcuration/tasks.py62.80% <60.00%> (+0.21%)⬆️
...ntcuration/contentcuration/viewsets/contentnode.py83.38% <77.77%> (-0.36%)⬇️
...migrations/0115_index_contentnode_node_id_field.py100.00% <100.00%> (ø)
...entcuration/migrations/0118_relaunch_migrations.py100.00% <100.00%> (ø)
contentcuration/contentcuration/models.py85.55% <100.00%> (+0.02%)⬆️
...ration/contentcuration/tests/test_exportchannel.py100.00% <100.00%> (ø)
... and 8 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 92b4aa9...950e24f. Read the comment docs.

@rtibbles
rtibbles merged commit 7d9b668 into learningequality:developJan 20, 2021
@rtibbles
rtibbles deleted the master_into_develop branch January 20, 2021 17:04
Sign up for freeto 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.

5 participants

@rtibbles@aronasorman@jayoshih@bjester@MisRob