Tim McCormack 5b331b2d4d Merge branch 'master' into timmc/misc-metric-attribute ...

# Conflicts:
#	cms/envs/common.py
#	lms/envs/common.py

2020-09-28 13:56:08 +00:00

..

docs/decisions

ARCHBOM-1339: add ADRs for extracting waffle_utils (#24798)

2020-09-25 15:02:46 -04:00

migrations

Run 2to3 -f future . -w

2019-12-30 10:35:30 -05:00

tests

Revert "Revert "ARCHBOM-1494: Refer to custom attributes, not metrics, especially with edx-django-utils (#25010)" (#25025)" (#25055)

2020-09-28 13:53:57 +00:00

__init__.py

Revert "Revert "ARCHBOM-1494: Refer to custom attributes, not metrics, especially with edx-django-utils (#25010)" (#25025)" (#25055)

2020-09-28 13:53:57 +00:00

admin.py

Run 2to3 -f future . -w

2019-12-30 10:35:30 -05:00

forms.py

Run 2to3 -f future . -w

2019-12-30 10:35:30 -05:00

models.py

Run 2to3 -f future . -w

2019-12-30 10:35:30 -05:00

testutils.py

ARCHBOM-1316: always enable some course_experience flags (#24322)

2020-07-02 12:00:23 -04:00

urls.py

Add django settings toggles to toggles endpoint.

2020-08-14 13:19:28 -04:00

views.py

add code_owner for flags and switches

2020-08-14 16:47:49 -04:00