stable -> master

[thelostone-mc]

Description

resolved conflicts + rebased against master

[codecov]

Codecov Report

Merging #5732 into master will increase coverage by 0.06%.
The diff coverage is 21.85%.

@@            Coverage Diff             @@
##           master    #5732      +/-   ##
==========================================
+ Coverage   29.97%   30.04%   +0.06%     
==========================================
  Files         249      254       +5     
  Lines       21448    21591     +143     
  Branches     3111     3138      +27     
==========================================
+ Hits         6430     6487      +57     
- Misses      14733    14828      +95     
+ Partials      285      276       -9

Impacted Files	Coverage Δ
app/app/thumbnail_processors.py	33.33% <ø> (ø)	⬆️
app/git/apps.py	0% <ø> (ø)	⬆️
app/kudos/templatetags/kudos_extras.py	70% <ø> (ø)	⬆️
app/kudos/admin.py	60.97% <ø> (ø)	⬆️
app/marketing/management/commands/pull_github.py	0% <ø> (ø)	⬆️
...ashboard/management/commands/setup_grants_clr_3.py	0% <ø> (ø)	⬆️
app/app/settings.py	80.2% <ø> (ø)	⬆️
app/dashboard/management/commands/calc_profile.py	0% <ø> (ø)	⬆️
.../dashboard/management/commands/migrate_profiles.py	0% <ø> (ø)	⬆️
app/grants/templatetags/grants_extra.py	100% <ø> (ø)	⬆️
... and 120 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 46c3929...7565a3e. Read the comment docs.