[extensions-web/deploy: 14/14] Merge branch 'master' into deploy

[Yuri Konotopov <ykonotopov src gnome org>]

commit f77b4f9bc1f23065efcbd038412a7c356193655b
Merge: d48c515 82761dd
Author: Yuri Konotopov <ykonotopov gnome org>
Date:   Sun May 29 16:50:29 2022 +0400

    Merge branch 'master' into deploy

 .gitlab-ci.yml                                     | 42 +++++++++--
 openshift/docker/Dockerfile                        | 10 +--
 openshift/docker/default.conf.template             | 61 ++++++++++++++++
 openshift/docker/docker-compose.yml                | 15 ++--
 openshift/docker/nginx/Dockerfile                  | 15 ----
 openshift/docker/nginx/nginx.conf                  | 82 ----------------------
 sweettooth/auth/backends.py                        |  2 +-
 sweettooth/auth/forms.py                           | 12 +++-
 sweettooth/auth/tests.py                           |  7 +-
 .../extensions/testdata/test_upgrade_data.json     |  2 +-
 sweettooth/extensions/tests.py                     |  1 +
 sweettooth/settings.py                             |  1 +
 sweettooth/users/admin.py                          |  5 ++
 sweettooth/users/migrations/0001_initial.py        | 35 ++++++++-
 .../users/migrations/0002_change_user_type.py      | 29 ++++++++
 .../users/migrations/0003_rename_users_table.py    | 17 +++++
 sweettooth/users/models.py                         | 15 ++++
 17 files changed, 228 insertions(+), 123 deletions(-)
---