From cbd8a23236a51ac9bcbf43243dfda89c65fd8177 Mon Sep 17 00:00:00 2001
From: s3lph <1375407-s3lph@users.noreply.gitlab.com>
Date: Tue, 19 Jul 2022 22:52:56 +0200
Subject: [PATCH 1/4] Add CI task to trigger a build of the repository
 pipeline. Hope this works...

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ba703c..7a00d33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ stages:
 - test
 - build
 - deploy
+- upload
 
 
 
@@ -123,3 +124,12 @@ release:
   - python package/release.py
   only:
   - tags
+
+
+repo:
+  stage: upload
+  trigger: s3lph/custom-packages
+  variables:
+    MULTIPROJECT_TRIGGER_JOBNAME: matemat
+  only:
+  - staging

From c7f6e1e849aa8b3ed54b773151534f851ba45144 Mon Sep 17 00:00:00 2001
From: s3lph <1375407-s3lph@users.noreply.gitlab.com>
Date: Tue, 19 Jul 2022 23:16:05 +0200
Subject: [PATCH 2/4] Works, restricting to tags only

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a00d33..adfd23b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -132,4 +132,4 @@ repo:
   variables:
     MULTIPROJECT_TRIGGER_JOBNAME: matemat
   only:
-  - staging
+  - tags

From caee4a3ee7d7f6b9958c41152923c971b3a3d146 Mon Sep 17 00:00:00 2001
From: s3lph <1375407-s3lph@users.noreply.gitlab.com>
Date: Wed, 20 Jul 2022 21:43:47 +0200
Subject: [PATCH 3/4] Sort user list in db.list_users rather than during
 templating. Closes !82

---
 matemat/db/facade.py       | 1 +
 templates/productlist.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/matemat/db/facade.py b/matemat/db/facade.py
index 3572ff9..ec4f3c7 100644
--- a/matemat/db/facade.py
+++ b/matemat/db/facade.py
@@ -87,6 +87,7 @@ class MatematDatabase(object):
                 SELECT user_id, username, email, is_admin, is_member, balance, receipt_pref
                 FROM users
                 WHERE touchkey IS NOT NULL OR NOT :must_have_touchkey
+                ORDER BY username COLLATE NOCASE ASC
               ''', {
                 'must_have_touchkey': with_touchkey
             }):
diff --git a/templates/productlist.html b/templates/productlist.html
index 104856d..8f1798e 100644
--- a/templates/productlist.html
+++ b/templates/productlist.html
@@ -36,7 +36,7 @@
             <div id="transfer-userlist">
                 <div id="scroll-up" onclick="scrollUserlist(-130);">▲</div>
                 <ul id="transfer-userlist-list">
-                    {% for user in ((users if user != authuser) | sort(attribute='name')) %}
+                    {% for user in (users if user != authuser) %}
                     <li onclick="set_transfer_user(this, {{ user.id }})">{{ user.name }}</li>
                     {% endfor %}
                 </ul>

From d846ddf0447debc45a7b1bdc27424fcc59c39720 Mon Sep 17 00:00:00 2001
From: s3lph <1375407-s3lph@users.noreply.gitlab.com>
Date: Wed, 20 Jul 2022 21:47:52 +0200
Subject: [PATCH 4/4] Prepare release v0.2.13

---
 CHANGELOG.md                          | 13 +++++++++++++
 matemat/__init__.py                   |  2 +-
 package/debian/matemat/DEBIAN/control |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e1140b..a800353 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Matemat Changelog
 
+<!-- BEGIN RELEASE v0.2.13 -->
+## Version 0.2.13
+
+UX release
+
+### Changes
+
+<!-- BEGIN CHANGES 0.2.13 -->
+- Consistently sort users by name instead of user id
+<!-- END CHANGES 0.2.13 -->
+
+<!-- END RELEASE v0.2.13 -->
+
 <!-- BEGIN RELEASE v0.2.12 -->
 ## Version 0.2.12
 
diff --git a/matemat/__init__.py b/matemat/__init__.py
index 3d84215..4b94a86 100644
--- a/matemat/__init__.py
+++ b/matemat/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.2.12'
+__version__ = '0.2.13'
diff --git a/package/debian/matemat/DEBIAN/control b/package/debian/matemat/DEBIAN/control
index a988eeb..3cce219 100644
--- a/package/debian/matemat/DEBIAN/control
+++ b/package/debian/matemat/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: matemat
-Version: 0.2.12
+Version: 0.2.13
 Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
 Section: web
 Priority: optional