Hotfixes to unstable#3104
Merged
bjester merged 74 commits intolearningequality:unstablefrom Apr 15, 2021
Merged
Conversation
First pass fix for non-existent users being passed to the calculate user storage task
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.0.1 to 8.1.1. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst) - [Commits](python-pillow/Pillow@8.0.1...8.1.1) Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.2 to 2.11.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/master/CHANGES.rst) - [Commits](pallets/jinja@2.11.2...2.11.3) Signed-off-by: dependabot[bot] <support@github.com>
…abot/pip/pillow-8.1.1 Bump pillow from 8.0.1 to 8.1.1
…abot/pip/jinja2-2.11.3 Bump jinja2 from 2.11.2 to 2.11.3
Bumps [rsa](https://github.com/sybrenstuvel/python-rsa) from 4.0 to 4.1. - [Release notes](https://github.com/sybrenstuvel/python-rsa/releases) - [Changelog](https://github.com/sybrenstuvel/python-rsa/blob/main/CHANGELOG.md) - [Commits](sybrenstuvel/python-rsa@version-4.0...version-4.1) Signed-off-by: dependabot[bot] <support@github.com>
…abot/pip/rsa-4.1 Bump rsa from 4.0 to 4.1
Bumps [pyyaml](https://github.com/yaml/pyyaml) from 5.3 to 5.4. - [Release notes](https://github.com/yaml/pyyaml/releases) - [Changelog](https://github.com/yaml/pyyaml/blob/master/CHANGES) - [Commits](yaml/pyyaml@5.3...5.4) Signed-off-by: dependabot[bot] <support@github.com>
…-release-2021-03-29 Merge Sprint release 2021-03-29 back into hotfixes
…d-since-check Disable modified_since check, since needs further query optimization
…-release-2021-03-29 Merge Sprint release 2021-03-29 back into hotfixes
…-release-2021-03-29 Release PR for Sprint ending 2021-03-29
…to avoid default setting.
Defer setting auto_now
…-release-2021-03-29 File modified fix for Sprint release 2021-03-29
…nt-release-2021-03-29 Merge pull request learningequality#3062 from learningequality/sprint-release-2021-03-29
Enable admin editing of channels in the UI.
Don't pass unsanitized inputs into regex.
Fix star/bookmarking feature in Content Library
…source-size-calc Quick change to disable synchronous calculation of resource size
Release PR for Sprint ending 2021-04-12
Master to hotfixes
rtibbles
approved these changes
Apr 15, 2021
Member
rtibbles
left a comment
rtibbles
left a comment
There was a problem hiding this comment.
All merged files look properly merged. Just linting to fix!
Codecov Report
@@ Coverage Diff @@
## unstable #3104 +/- ##
===========================================
Coverage ? 85.99%
===========================================
Files ? 305
Lines ? 16513
Branches ? 0
===========================================
Hits ? 14201
Misses ? 2312
Partials ? 0 Continue to review full report at Codecov.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge down hotfixes to unstable branch
Merge conflicts: