From bb10b9cda6842186bbfe100e016f50c7cf868f3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 01:51:13 +0300
Subject: [PATCH 01/57] Add `bio` field to `accounts.Profile` model

---
 accounts/forms.py                             |  5 ++++-
 accounts/migrations/0003_profile_bio.py       | 18 +++++++++++++++++
 accounts/models.py                            |  1 +
 djangoproject/scss/_style.scss                | 20 ++++++++++++++++++-
 .../templates/accounts/edit_profile.html      |  7 +++++++
 .../templates/accounts/user_profile.html      | 10 ++++++++--
 6 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 accounts/migrations/0003_profile_bio.py

diff --git a/accounts/forms.py b/accounts/forms.py
index f863c06787..eac1f5e1e6 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -20,10 +20,13 @@ class ProfileForm(forms.ModelForm):
     email = forms.EmailField(
         required=False, widget=forms.TextInput(attrs={"placeholder": _("Email")})
     )
+    bio = forms.CharField(
+        required=False, widget=forms.Textarea(attrs={"placeholder": _("Bio")})
+    )
 
     class Meta:
         model = Profile
-        fields = ["name"]
+        fields = ["name", "bio"]
 
     def __init__(self, *args, **kwargs):
         instance = kwargs.get("instance", None)
diff --git a/accounts/migrations/0003_profile_bio.py b/accounts/migrations/0003_profile_bio.py
new file mode 100644
index 0000000000..26b33e32cf
--- /dev/null
+++ b/accounts/migrations/0003_profile_bio.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.2.7 on 2025-10-19 01:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_migrate_sha1_passwords'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='profile',
+            name='bio',
+            field=models.TextField(blank=True),
+        ),
+    ]
diff --git a/accounts/models.py b/accounts/models.py
index 5372b2caa3..63eb1013f8 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -5,6 +5,7 @@
 class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=200, blank=True)
+    bio = models.TextField(blank=True)
 
     def __str__(self):
         return self.name or str(self.user)
diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 2fe7c0cfd1..4482f6e25d 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -3191,7 +3191,25 @@ hr {
 .user-info {
     .avatar {
         @include framed-image();
-        float: right;
+        margin: 4rem 1rem 0rem 1rem;
+
+        // The reason for specifying `355px` is to ensure that the image does not cause vertical space between the first name and last name on this screen size.
+        @include respond-min(355px) {
+            float: right;
+            margin: 0 0 1rem 1rem;
+        }
+    }
+
+    .name {
+        margin-bottom: 0;
+    }
+
+    .bio {
+        @include font-size(16);
+        font-weight: normal;
+        line-height: 1.5;
+        white-space: pre-line;
+        margin-top: 0;
     }
 }
 
diff --git a/djangoproject/templates/accounts/edit_profile.html b/djangoproject/templates/accounts/edit_profile.html
index 29d5dfc2d9..433b89d3be 100644
--- a/djangoproject/templates/accounts/edit_profile.html
+++ b/djangoproject/templates/accounts/edit_profile.html
@@ -27,6 +27,13 @@ <h1>{% translate "Edit your profile" %}</h1>
             <p>{{ form.email }}</p>
         </div>
 
+        <div>
+            {% if form.bio.errors %}
+                <p class="errors">{{ form.bio.errors.as_text }}</p>
+            {% endif %}
+            <p>{{ form.bio }}</p>
+        </div>
+
         <div class="submit">
             <input class="cta" type="submit" value="{% translate "Save" %}"/>
         </div>
diff --git a/djangoproject/templates/accounts/user_profile.html b/djangoproject/templates/accounts/user_profile.html
index 1c89ed9eab..40fd510744 100644
--- a/djangoproject/templates/accounts/user_profile.html
+++ b/djangoproject/templates/accounts/user_profile.html
@@ -15,7 +15,7 @@ <h2 id="aside-header">
 
         <p>{% translate "Need to edit something? Here's how:" %}</p>
         <ul>
-            <li><a href="{% url 'edit_profile' %}">{% translate "Edit your name and email here." %}</a></li>
+            <li><a href="{% url 'edit_profile' %}">{% translate "Edit your name, email and bio here." %}</a></li>
             <li>{% blocktranslate trimmed %}
                 The image is the <a href="https://en.gravatar.com/">Gravatar</a> linked
                 to the email address you signed up with. You can change the image over
@@ -37,10 +37,16 @@ <h2 id="aside-header">
         <img class='avatar' width='150' height='150'
              src="https://secure.gravatar.com/avatar/{{ email_hash }}?s=150&amp;d=https%3A%2F%2Frobohash.org%2F{{ email_hash }}%3Fset%3Dset3%26size%3D150x150">
 
-        <h1>
+        <h1 class="name">
             {% firstof user_obj.profile.name user_obj.username %}
         </h1>
 
+        {% if user_obj.profile.bio %}
+            <p class="bio">
+                {{ user_obj.profile.bio }}
+            </p>
+        {% endif %}
+
         {% if stats %}
             <h2>{% translate "Statistics on Django core contributions:" %}</h2>
             <ul>

From 2c2915800bf070b810de5e7cec35c3927f4d4835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 02:09:12 +0300
Subject: [PATCH 02/57] Apply black to migrations

---
 accounts/migrations/0003_profile_bio.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/accounts/migrations/0003_profile_bio.py b/accounts/migrations/0003_profile_bio.py
index 26b33e32cf..85d6e561f3 100644
--- a/accounts/migrations/0003_profile_bio.py
+++ b/accounts/migrations/0003_profile_bio.py
@@ -6,13 +6,13 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0002_migrate_sha1_passwords'),
+        ("accounts", "0002_migrate_sha1_passwords"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='profile',
-            name='bio',
+            model_name="profile",
+            name="bio",
             field=models.TextField(blank=True),
         ),
     ]

From 093ed87004408e72fad6aca29fcadfda92328806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 02:50:02 +0300
Subject: [PATCH 03/57] Add a nullable one-to-one `user` field linking
 `IndividualMember` to `AUTH_USER_MODEL`

---
 .../migrations/0010_individualmember_user.py  | 26 +++++++++++++++++++
 members/models.py                             |  7 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 members/migrations/0010_individualmember_user.py

diff --git a/members/migrations/0010_individualmember_user.py b/members/migrations/0010_individualmember_user.py
new file mode 100644
index 0000000000..b0abc98937
--- /dev/null
+++ b/members/migrations/0010_individualmember_user.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.2.7 on 2025-10-19 18:16
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0009_alter_individualmember_add_reason_help_text"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="individualmember",
+            name="user",
+            field=models.OneToOneField(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+    ]
diff --git a/members/models.py b/members/models.py
index c18270280c..457106ac46 100644
--- a/members/models.py
+++ b/members/models.py
@@ -1,5 +1,6 @@
 from collections import defaultdict
 
+from django.conf import settings
 from django.core import signing
 from django.db import models
 from django.db.models.signals import post_save
@@ -38,6 +39,12 @@
 
 
 class IndividualMember(models.Model):
+    user = models.OneToOneField(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+    )
     name = models.CharField(max_length=250)
     email = models.EmailField(unique=True)
     member_since = models.DateField(default=timezone_today)

From 8b918c0694304e71ac1abfe68087c8d427780874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 03:08:39 +0300
Subject: [PATCH 04/57] Display `IndividualMember` names as links to their
 profiles when associated with a user

---
 .../members/individualmember_list.html          | 17 +++++++++++++++--
 members/views.py                                |  6 ++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/djangoproject/templates/members/individualmember_list.html b/djangoproject/templates/members/individualmember_list.html
index 95d1769cee..431a94a7aa 100644
--- a/djangoproject/templates/members/individualmember_list.html
+++ b/djangoproject/templates/members/individualmember_list.html
@@ -77,7 +77,13 @@ <h1>{% translate "Individual members" %}</h1>
 
   <ul>
     {% for member in members %}
-      <li>{{ member.name }}</li>
+      <li>
+        {% if member.user %}
+          <a href="{% url 'user_profile' username=member.user.username %}">{{ member.name }}</a>
+        {% else %}
+          {{ member.name }}
+        {% endif %}
+      </li>
     {% endfor %}
   </ul>
 
@@ -87,7 +93,14 @@ <h2>{% translate "Former members" %}</h2>
 
     <ul>
       {% for member in former_members %}
-        <li>{{ member.name }}{% if member.reason_for_leaving %} ({{ member.reason_for_leaving }}){% endif %}</li>
+        <li>
+          {% if member.user %}
+            <a href="{% url 'user_profile' username=member.user.username %}">{{ member.name }}</a>
+          {% else %}
+            {{ member.name }}
+          {% endif %}
+          {% if member.reason_for_leaving %}({{ member.reason_for_leaving }}){% endif %}
+        </li>
       {% endfor %}
     </ul>
   {% endif %}
diff --git a/members/views.py b/members/views.py
index 2ed4d5c6be..e6d38bda6e 100644
--- a/members/views.py
+++ b/members/views.py
@@ -20,11 +20,13 @@ class IndividualMemberListView(ListView):
     context_object_name = "members"
 
     def get_queryset(self):
-        return super().get_queryset().filter(member_until=None)
+        return super().get_queryset().select_related("user").filter(member_until=None)
 
     def get_context_data(self):
         context = super().get_context_data()
-        context["former_members"] = IndividualMember.objects.filter(
+        context["former_members"] = IndividualMember.objects.select_related(
+            "user",
+        ).filter(
             member_until__lte=timezone_today(),
         )
         return context

From 6e90cd5e5facf5fb0efa704110b525a049aed900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 04:00:57 +0300
Subject: [PATCH 05/57] Fix vertical split of profile name caused by floated
 image

---
 djangoproject/scss/_style.scss | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 4482f6e25d..fd6c0acb08 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -3189,19 +3189,33 @@ hr {
 }
 
 .user-info {
+    // Keep this value in sync with the width value of the img element in the HTML.
+    $user_info_avatar_img_width: 150px;
+
     .avatar {
         @include framed-image();
         margin: 4rem 1rem 0rem 1rem;
 
-        // The reason for specifying `355px` is to ensure that the image does not cause vertical space between the first name and last name on this screen size.
-        @include respond-min(355px) {
+        // Using `float: right` causes the image to separate words vertically by its own height on some screen sizes.
+        @include respond-min(811px) {
             float: right;
-            margin: 0 0 1rem 1rem;
+            margin: 4rem 1rem 1rem 1rem;
         }
     }
 
     .name {
         margin-bottom: 0;
+        
+        @include respond-min(811px) {
+            // These rules prevents the unwanted vertical space between words as described in the `.avatar` class.
+            display: inline-block;
+            max-width: calc(100% - $user_info_avatar_img_width);
+        }
+
+        @include respond-max(810px) {
+            // Reposition the name when it's below the image on small screens.
+            margin-top: 2rem;
+        }
     }
 
     .bio {

From 6a2322dd0461825ee1af0af46c87be8f523d29f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 04:44:44 +0300
Subject: [PATCH 06/57] Make the `user` field on `IndividualMemberAdmin`
 auto-completable

---
 members/admin.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/members/admin.py b/members/admin.py
index a12945e07f..10c00437cd 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -19,6 +19,7 @@ class IndividualMemberAdmin(admin.ModelAdmin):
         "member_until",
     ]
     search_fields = ["name"]
+    autocomplete_fields = ["user"]
 
 
 class InvoiceInline(admin.TabularInline):

From a55a0f550575ee6b86c83dc067c978dc68702d01 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 02:13:04 +0000
Subject: [PATCH 07/57] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 djangoproject/scss/_style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index fd6c0acb08..6386a5e70b 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -3205,7 +3205,7 @@ hr {
 
     .name {
         margin-bottom: 0;
-        
+
         @include respond-min(811px) {
             // These rules prevents the unwanted vertical space between words as described in the `.avatar` class.
             display: inline-block;

From 9a180f12d91696e9eb2c3e3cca3facb1cdabd41a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 07:06:42 +0300
Subject: [PATCH 08/57] Update `UserProfileTests.test_username_is_page_title`
 to reflect template changes

---
 accounts/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index c41d893b1a..a327e25748 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -24,7 +24,7 @@ def setUpTestData(cls):
 
     def test_username_is_page_title(self):
         response = self.client.get(self.user1_url)
-        self.assertContains(response, "<h1>user1</h1>", html=True)
+        self.assertContains(response, '<h1 class="name">user1</h1>', html=True)
 
     def test_stat_commits(self):
         Revision.objects.create(

From a352eda98c95dec56855b4b53623ac653a01b4c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Mon, 20 Oct 2025 07:54:53 +0300
Subject: [PATCH 09/57] Add profile link tests for current and former
 individual members

---
 members/test_views.py | 82 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 75 insertions(+), 7 deletions(-)

diff --git a/members/test_views.py b/members/test_views.py
index 579c03b83a..4d5d78d2b6 100644
--- a/members/test_views.py
+++ b/members/test_views.py
@@ -1,5 +1,6 @@
 from datetime import date, timedelta
 
+from django.contrib.auth.models import User
 from django.test import TestCase
 from django.urls import reverse
 
@@ -10,12 +11,6 @@
 class IndividualMemberListViewTests(TestCase):
     url = reverse("members:individual-members")
 
-    @classmethod
-    def setUpTestData(cls):
-        IndividualMember.objects.create(
-            name="DjangoDeveloper", email="developer@example.com"
-        )
-
     def test_developer_member_redirect(self):
         old_url = reverse("members:developer-members")
         response = self.client.get(old_url)
@@ -24,7 +19,80 @@ def test_developer_member_redirect(self):
     def test_view_render(self):
         response = self.client.get(self.url)
         self.assertContains(response, "Individual members")
-        self.assertContains(response, "DjangoDeveloper")
+
+    def test_view_should_link_only_existing_profiles_of_members(self):
+        developer1 = User.objects.create_user(
+            username="developer1",
+            password="password",
+        )
+        developer2 = User.objects.create_user(
+            username="developer2",
+            password="password",
+        )
+        individual_member1 = IndividualMember.objects.create(
+            user=developer1,
+            name="DjangoDeveloper1",
+            email="developer1@example.com",
+        )
+        individual_member2 = IndividualMember.objects.create(
+            user=developer2,
+            name="DjangoDeveloper2",
+            email="developer2@example.com",
+        )
+        individual_member3 = IndividualMember.objects.create(
+            name="DjangoDeveloper3",
+            email="developer3@example.com",
+        )
+        developer1_url = reverse("user_profile", args=["developer1"])
+        developer2_url = reverse("user_profile", args=["developer2"])
+        developer3_url = reverse("user_profile", args=["developer3"])
+        response = self.client.get(self.url)
+        self.assertContains(response, developer1_url)
+        self.assertContains(response, individual_member1.name)
+        self.assertContains(response, developer2_url)
+        self.assertContains(response, individual_member2.name)
+        self.assertNotContains(response, developer3_url)
+        self.assertContains(response, individual_member3.name)
+
+    def test_view_should_link_only_existing_profiles_of_former_members(self):
+        developer1 = User.objects.create_user(
+            username="developer1",
+            password="password",
+        )
+        developer2 = User.objects.create_user(
+            username="developer2",
+            password="password",
+        )
+        individual_member1 = IndividualMember.objects.create(
+            user=developer1,
+            name="DjangoDeveloper1",
+            email="developer1@example.com",
+            member_since=date(2015, 7, 26),
+            member_until=date(2015, 7, 27),
+        )
+        individual_member2 = IndividualMember.objects.create(
+            user=developer2,
+            name="DjangoDeveloper2",
+            email="developer2@example.com",
+            member_since=date(2015, 7, 26),
+            member_until=date(2015, 7, 27),
+        )
+        individual_member3 = IndividualMember.objects.create(
+            name="DjangoDeveloper3",
+            email="developer3@example.com",
+            member_since=date(2015, 7, 26),
+            member_until=date(2015, 7, 27),
+        )
+        developer1_url = reverse("user_profile", args=["developer1"])
+        developer2_url = reverse("user_profile", args=["developer2"])
+        developer3_url = reverse("user_profile", args=["developer3"])
+        response = self.client.get(self.url)
+        self.assertContains(response, developer1_url)
+        self.assertContains(response, individual_member1.name)
+        self.assertContains(response, developer2_url)
+        self.assertContains(response, individual_member2.name)
+        self.assertNotContains(response, developer3_url)
+        self.assertContains(response, individual_member3.name)
 
     def test_view_should_only_render_former_members_once(self):
         IndividualMember.objects.create(

From 36b3f906a86a985b53a48383584e2f32f4cec4bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Tue, 21 Oct 2025 05:27:28 +0300
Subject: [PATCH 10/57] Add admin action to send account invite mail to
 individual members

---
 djangoproject/settings/common.py              |  2 +
 .../members/email/account_invite.txt          | 17 +++++
 members/admin.py                              | 74 ++++++++++++++++++-
 ...alter_individualmember_options_and_more.py | 35 +++++++++
 members/models.py                             | 65 +++++++++++++++-
 5 files changed, 188 insertions(+), 5 deletions(-)
 create mode 100644 djangoproject/templates/members/email/account_invite.txt
 create mode 100644 members/migrations/0011_alter_individualmember_options_and_more.py

diff --git a/djangoproject/settings/common.py b/djangoproject/settings/common.py
index fff6e1dfee..09be7f8461 100644
--- a/djangoproject/settings/common.py
+++ b/djangoproject/settings/common.py
@@ -53,6 +53,8 @@
 
 DEFAULT_FROM_EMAIL = "noreply@djangoproject.com"
 FUNDRAISING_DEFAULT_FROM_EMAIL = "fundraising@djangoproject.com"
+# TODO(ertgl): Update `settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL`.
+INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL = DEFAULT_FROM_EMAIL
 
 FIXTURE_DIRS = [str(PROJECT_PACKAGE.joinpath("fixtures"))]
 
diff --git a/djangoproject/templates/members/email/account_invite.txt b/djangoproject/templates/members/email/account_invite.txt
new file mode 100644
index 0000000000..9de1b73dc5
--- /dev/null
+++ b/djangoproject/templates/members/email/account_invite.txt
@@ -0,0 +1,17 @@
+{% spaceless %}
+Hello {{ name }},
+
+We're updating the Django Individual Members list so each member's name can link to their djangoproject.com profile. On your profile, you can share a short bio, highlight your contributions to Django or the community, and provide ways for others to get in touch.
+
+To have your name linked, please create an account (if you don't already have one) at:
+
+{% url 'registration_register' %}
+
+Once your account is ready, let us know your username so we can connect it to the members list.
+
+This small step helps the community grow more connected and makes it easier for everyone to explore and engage with it.
+
+Thank you for being part of the Django community.
+
+Django Software Foundation
+{% endspaceless %}
diff --git a/members/admin.py b/members/admin.py
index 10c00437cd..0793c5823e 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -1,12 +1,20 @@
 from datetime import date, timedelta
 
-from django.contrib import admin
+from django.contrib import admin, messages
+from django.contrib.auth import get_permission_codename
+from django.db import transaction
 from django.templatetags.static import static
 from django.utils.formats import localize
 from django.utils.html import format_html
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _, ngettext
 
-from members.models import CorporateMember, IndividualMember, Invoice, Team
+from members.models import (
+    CorporateMember,
+    IndividualMember,
+    IndividualMemberAccountInviteSendMailStatus,
+    Invoice,
+    Team,
+)
 
 
 @admin.register(IndividualMember)
@@ -17,9 +25,69 @@ class IndividualMemberAdmin(admin.ModelAdmin):
         "is_active",
         "member_since",
         "member_until",
+        "account_invite_mail_sent_at",
     ]
     search_fields = ["name"]
+    list_filter = ["member_until", "account_invite_mail_sent_at"]
     autocomplete_fields = ["user"]
+    actions = ["send_account_invite_mail"]
+
+    @admin.action(
+        description=_("Send account invite mail to selected individual members"),
+        permissions=["send_account_invite_mail"],
+    )
+    def send_account_invite_mail(self, request, queryset):
+        with transaction.atomic():
+            results = IndividualMember.send_account_invite_mails(queryset)
+        sent_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.SENT,
+            0,
+        )
+        failed_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.FAILED,
+            0,
+        )
+        skipped_count = results.get(
+            IndividualMemberAccountInviteSendMailStatus.SKIPPED,
+            0,
+        )
+        if sent_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Sent account invite mail to 1 individual member.",
+                    "Sent account invite mail to %(count)d individual members.",
+                    sent_count,
+                )
+                % {"count": sent_count},
+                messages.SUCCESS,
+            )
+        if failed_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Failed to send account invite mail to 1 individual member.",
+                    "Failed to send account invite mail to %(count)d individual members.",
+                    failed_count,
+                )
+                % {"count": failed_count},
+                messages.ERROR,
+            )
+        if skipped_count > 0:
+            self.message_user(
+                request,
+                ngettext(
+                    "Skipped sending account invite mail to 1 individual member (already has an account linked or an invite mail has been sent).",
+                    "Skipped sending account invite mail to %(count)d individual members (already have accounts linked or invite mails have been sent).",
+                    skipped_count,
+                )
+                % {"count": skipped_count},
+                messages.INFO,
+            )
+
+    def has_send_account_invite_mail_permission(self, request):
+        codename = get_permission_codename("send_account_invite_mail", self.opts)
+        return request.user.has_perm("%s.%s" % (self.opts.app_label, codename))
 
 
 class InvoiceInline(admin.TabularInline):
diff --git a/members/migrations/0011_alter_individualmember_options_and_more.py b/members/migrations/0011_alter_individualmember_options_and_more.py
new file mode 100644
index 0000000000..0acb1baccf
--- /dev/null
+++ b/members/migrations/0011_alter_individualmember_options_and_more.py
@@ -0,0 +1,35 @@
+# Generated by Django 5.2.7 on 2025-10-20 19:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("members", "0010_individualmember_user"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="individualmember",
+            options={
+                "ordering": ["name"],
+                "permissions": [
+                    (
+                        "send_account_invite_mail",
+                        "Can send account invite mail to an individual member",
+                    )
+                ],
+            },
+        ),
+        migrations.AddField(
+            model_name="individualmember",
+            name="account_invite_mail_sent_at",
+            field=models.DateTimeField(blank=True, db_index=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="individualmember",
+            name="member_until",
+            field=models.DateField(blank=True, db_index=True, null=True),
+        ),
+    ]
diff --git a/members/models.py b/members/models.py
index 457106ac46..9a33409519 100644
--- a/members/models.py
+++ b/members/models.py
@@ -1,11 +1,15 @@
 from collections import defaultdict
+from enum import StrEnum
 
 from django.conf import settings
 from django.core import signing
-from django.db import models
+from django.core.mail import send_mail
+from django.db import models, transaction
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
+from django.utils.timezone import now as timezone_now
 from django.utils.translation import gettext_lazy as _
 from django.views.generic.dates import timezone_today
 from django_hosts import reverse
@@ -38,6 +42,12 @@
 MEMBERSHIP_TO_KEY = {k: v.lower() for k, v in MEMBERSHIP_LEVELS}
 
 
+class IndividualMemberAccountInviteSendMailStatus(StrEnum):
+    SENT = "SENT"
+    FAILED = "FAILED"
+    SKIPPED = "SKIPPED"
+
+
 class IndividualMember(models.Model):
     user = models.OneToOneField(
         settings.AUTH_USER_MODEL,
@@ -48,7 +58,7 @@ class IndividualMember(models.Model):
     name = models.CharField(max_length=250)
     email = models.EmailField(unique=True)
     member_since = models.DateField(default=timezone_today)
-    member_until = models.DateField(null=True, blank=True)
+    member_until = models.DateField(null=True, blank=True, db_index=True)
     reason_for_leaving = models.TextField(
         blank=True,
         help_text=mark_safe(
@@ -58,9 +68,33 @@ class IndividualMember(models.Model):
             )
         ),
     )
+    account_invite_mail_sent_at = models.DateTimeField(
+        blank=True,
+        null=True,
+        db_index=True,
+    )
 
     class Meta:
         ordering = ["name"]
+        permissions = [
+            (
+                "send_account_invite_mail",
+                _("Can send account invite mail to an individual member"),
+            ),
+        ]
+
+    @classmethod
+    def send_account_invite_mails(cls, queryset):
+        results = {}
+        # Wait for other active transactions to prevent race conditions.
+        queryset = queryset.select_for_update(nowait=False)
+        for individual_member in queryset.iterator():
+            status = individual_member.send_account_invite_mail()
+            if status not in results:
+                results[status] = 1
+            else:
+                results[status] += 1
+        return results
 
     def __str__(self):
         return self.name
@@ -69,6 +103,33 @@ def __str__(self):
     def is_active(self):
         return self.member_until is None
 
+    def send_account_invite_mail(self):
+        if self.user_id or self.account_invite_mail_sent_at:
+            return IndividualMemberAccountInviteSendMailStatus.SKIPPED
+        mail_subject = "Make your Django Individual Membership profile visible"
+        mail_content = render_to_string(
+            "members/email/account_invite.txt",
+            {
+                "name": self.name,
+            },
+        )
+        # Create an inner savepoint to prevent any outer successful operation to be rolled back in case of failure here.
+        with transaction.atomic():
+            sent = send_mail(
+                mail_subject,
+                mail_content,
+                settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
+                [
+                    settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
+                    self.email,
+                ],
+            )
+            if sent:
+                self.account_invite_mail_sent_at = timezone_now()
+                self.save()
+                return IndividualMemberAccountInviteSendMailStatus.SENT
+        return IndividualMemberAccountInviteSendMailStatus.FAILED
+
 
 class Team(models.Model):
     name = models.CharField(max_length=250)

From b7ad21fa40855f5c083a593a172271a10cfa4310 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 02:28:29 +0000
Subject: [PATCH 11/57] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 members/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/members/admin.py b/members/admin.py
index 0793c5823e..62341a8d84 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -87,7 +87,7 @@ def send_account_invite_mail(self, request, queryset):
 
     def has_send_account_invite_mail_permission(self, request):
         codename = get_permission_codename("send_account_invite_mail", self.opts)
-        return request.user.has_perm("%s.%s" % (self.opts.app_label, codename))
+        return request.user.has_perm("{}.{}".format(self.opts.app_label, codename))
 
 
 class InvoiceInline(admin.TabularInline):

From da706a4e80d982f2c1d9402e2b7449c005e6d6d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Tue, 21 Oct 2025 05:34:57 +0300
Subject: [PATCH 12/57] Fix Flake8 E501 (line too long) errors

---
 members/admin.py  | 12 ++++++++++--
 members/models.py |  3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/members/admin.py b/members/admin.py
index 62341a8d84..1365c03e3c 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -77,8 +77,16 @@ def send_account_invite_mail(self, request, queryset):
             self.message_user(
                 request,
                 ngettext(
-                    "Skipped sending account invite mail to 1 individual member (already has an account linked or an invite mail has been sent).",
-                    "Skipped sending account invite mail to %(count)d individual members (already have accounts linked or invite mails have been sent).",
+                    (
+                        "Skipped sending account invite mail to 1 individual member"
+                        " (already has an account linked or an invite mail has been"
+                        " sent)."
+                    ),
+                    (
+                        "Skipped sending account invite mail to %(count)d individual"
+                        " members (already have accounts linked or invite mails have"
+                        " been sent)."
+                    ),
                     skipped_count,
                 )
                 % {"count": skipped_count},
diff --git a/members/models.py b/members/models.py
index 9a33409519..7254526c08 100644
--- a/members/models.py
+++ b/members/models.py
@@ -113,7 +113,8 @@ def send_account_invite_mail(self):
                 "name": self.name,
             },
         )
-        # Create an inner savepoint to prevent any outer successful operation to be rolled back in case of failure here.
+        # Create an inner savepoint to prevent any outer successful operation
+        # to be rolled back in case of failure here.
         with transaction.atomic():
             sent = send_mail(
                 mail_subject,

From d4d88732a9fc0bd898c297c6364da7ae90b0da4a Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 02:35:41 +0000
Subject: [PATCH 13/57] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 members/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/members/admin.py b/members/admin.py
index 1365c03e3c..209bd2b60d 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -95,7 +95,7 @@ def send_account_invite_mail(self, request, queryset):
 
     def has_send_account_invite_mail_permission(self, request):
         codename = get_permission_codename("send_account_invite_mail", self.opts)
-        return request.user.has_perm("{}.{}".format(self.opts.app_label, codename))
+        return request.user.has_perm(f"{self.opts.app_label}.{codename}")
 
 
 class InvoiceInline(admin.TabularInline):

From b91812232d10bf50f04d1374a841450a47a91643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Wed, 22 Oct 2025 03:56:28 +0300
Subject: [PATCH 14/57] Introduce several improvements (please see the commit
 message for details)

1. Implement `BoundFieldWithCharacterCounter` to add character counter specific data to any `CharField` inputs.
2. Implement character counter in JavaScript so we can enhance the page progressively.
3. Make `ProfileForm.bio` field use `BoundFieldWithCharacterCounter`.
4. Set maxlength for `ProfileForm.bio` field.
5. Render `profile.bio` with `urlize` to convert URLs and mail addresses in the plaintext into clickable links.

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
---
 accounts/forms.py                             | 10 ++-
 contrib/__init__.py                           |  0
 contrib/django/__init__.py                    |  0
 contrib/django/forms/__init__.py              |  0
 contrib/django/forms/boundfields.py           | 15 +++++
 djangoproject/scss/_style.scss                |  4 ++
 .../static/js/mod/character-counter.js        | 67 +++++++++++++++++++
 .../templates/accounts/edit_profile.html      | 30 ++++++++-
 .../templates/accounts/user_profile.html      |  2 +-
 9 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 contrib/__init__.py
 create mode 100644 contrib/django/__init__.py
 create mode 100644 contrib/django/forms/__init__.py
 create mode 100644 contrib/django/forms/boundfields.py
 create mode 100644 djangoproject/static/js/mod/character-counter.js

diff --git a/accounts/forms.py b/accounts/forms.py
index eac1f5e1e6..99e7319f87 100644
--- a/accounts/forms.py
+++ b/accounts/forms.py
@@ -3,6 +3,8 @@
 from django.db.models import ProtectedError
 from django.utils.translation import gettext_lazy as _
 
+from contrib.django.forms.boundfields import BoundFieldWithCharacterCounter
+
 from .models import Profile
 
 
@@ -21,7 +23,13 @@ class ProfileForm(forms.ModelForm):
         required=False, widget=forms.TextInput(attrs={"placeholder": _("Email")})
     )
     bio = forms.CharField(
-        required=False, widget=forms.Textarea(attrs={"placeholder": _("Bio")})
+        bound_field_class=BoundFieldWithCharacterCounter,
+        required=False,
+        max_length=3_000,
+        widget=forms.Textarea(attrs={"placeholder": _("Bio")}),
+        help_text=_(
+            "URLs and email addresses are automatically converted into clickable links.",
+        ),
     )
 
     class Meta:
diff --git a/contrib/__init__.py b/contrib/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/contrib/django/__init__.py b/contrib/django/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/contrib/django/forms/__init__.py b/contrib/django/forms/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/contrib/django/forms/boundfields.py b/contrib/django/forms/boundfields.py
new file mode 100644
index 0000000000..e0a9b228c3
--- /dev/null
+++ b/contrib/django/forms/boundfields.py
@@ -0,0 +1,15 @@
+from contextlib import suppress
+from django.forms.boundfield import BoundField
+
+
+class BoundFieldWithCharacterCounter(BoundField):
+
+    def get_characters_remaining_count(self):
+        characters_remaining_count = None
+        max_length = None
+        with suppress(TypeError, ValueError):
+            max_length = int(self.field.max_length)
+        if isinstance(max_length, int):
+            value = self.value().replace("\r\n", "\n").replace("\r", "\n")
+            characters_remaining_count = max_length - len(value)
+        return characters_remaining_count
diff --git a/djangoproject/scss/_style.scss b/djangoproject/scss/_style.scss
index 6386a5e70b..46725d311b 100644
--- a/djangoproject/scss/_style.scss
+++ b/djangoproject/scss/_style.scss
@@ -2967,6 +2967,10 @@ form {
             background: var(--primary);
         }
     }
+
+    .help-text  {
+      @include font-size(14);
+    }
 }
 
 .form-general {
diff --git a/djangoproject/static/js/mod/character-counter.js b/djangoproject/static/js/mod/character-counter.js
new file mode 100644
index 0000000000..288857059f
--- /dev/null
+++ b/djangoproject/static/js/mod/character-counter.js
@@ -0,0 +1,67 @@
+let CHARACTER_COUNTER_INPUT_SELECTOR_ATTR = 'data-character-counter-input-selector';
+
+let CHARACTER_COUNTER_INDICATOR_SELECTOR_ATTR = 'data-character-counter-indicator-selector';
+
+let CharacterCounter = function (inputElement, indicatorElement) {
+  this.inputElement = inputElement;
+  this.indicatorElement = indicatorElement;
+};
+
+CharacterCounter.prototype = {
+  handleInputEvent: function (ev) {
+    this.updateDOM();
+  },
+
+  updateDOM: function () {
+    if (typeof this.inputElement.maxLength !== 'number') {
+      return;
+    }
+
+    if (typeof this.inputElement.value !== 'string') {
+      return;
+    }
+
+    const remaining = this.inputElement.maxLength - this.inputElement.value.length;
+    this.indicatorElement.innerText = String(remaining);
+  },
+};
+
+function setupCharacterCounter(counterElement) {
+  let inputSelector = counterElement.getAttribute(CHARACTER_COUNTER_INPUT_SELECTOR_ATTR);
+  if (typeof inputSelector !== 'string') {
+    return;
+  }
+
+  let indicatorSelector = counterElement.getAttribute(CHARACTER_COUNTER_INDICATOR_SELECTOR_ATTR);
+  if (typeof indicatorSelector !== 'string') {
+    return;
+  }
+
+  let inputElement = document.querySelector(inputSelector);
+  if (inputElement == null) {
+    return;
+  }
+
+  let indicatorElement = document.querySelector(indicatorSelector);
+  if (indicatorElement == null) {
+    return;
+  }
+
+  let characterCounter = new CharacterCounter(inputElement, indicatorElement);
+
+  inputElement.addEventListener(
+    'input',
+    characterCounter.handleInputEvent.bind(characterCounter),
+  )
+}
+
+function setupCharacterCounters() {
+  let counterElements = document.getElementsByClassName('character-counter');
+  for (let i = 0; i < counterElements.length; i++) {
+    setupCharacterCounter(counterElements[i]);
+  }
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+  setupCharacterCounters();
+});
diff --git a/djangoproject/templates/accounts/edit_profile.html b/djangoproject/templates/accounts/edit_profile.html
index 433b89d3be..0de86f7b20 100644
--- a/djangoproject/templates/accounts/edit_profile.html
+++ b/djangoproject/templates/accounts/edit_profile.html
@@ -1,8 +1,12 @@
 {% extends "registration/base.html" %}
-{% load i18n %}
+{% load i18n static %}
 
 {% block title %}{% translate "Edit your profile" %}{% endblock %}
 
+{% block head_extra %}
+  <script src="{% static "js/mod/character-counter.js" %}"></script>
+{% endblock head_extra %}
+
 {% block content %}
 
     {% if form.errors %}
@@ -29,9 +33,31 @@ <h1>{% translate "Edit your profile" %}</h1>
 
         <div>
             {% if form.bio.errors %}
-                <p class="errors">{{ form.bio.errors.as_text }}</p>
+                <p id="{{ form.bio.id_for_label }}_error" class="errors">
+                  {{ form.bio.errors.as_text }}
+                </p>
             {% endif %}
             <p>{{ form.bio }}</p>
+            <div id="{{ form.bio.id_for_label }}_helptext" class="help-text">
+                <div>{{ form.bio.help_text }}</div>
+                {% with bio_characters_remaining_count=form.bio.get_characters_remaining_count %}
+                    {% if bio_characters_remaining_count is not None %}
+                        <div
+                            class="character-counter"
+                            data-character-counter-input-selector="#{{ form.bio.id_for_label }}"
+                            data-character-counter-indicator-selector="#{{ form.bio.id_for_label }}_characters_remaining_count"
+                        >
+                            <span>{% translate "Characters remaining:" %}</span>
+                            <span
+                                id="{{ form.bio.id_for_label }}_characters_remaining_count"
+                                class="character-counter__indicator"
+                            >
+                                {{ bio_characters_remaining_count }}
+                            </span>
+                        </div>
+                    {% endif %}
+                {% endwith %}
+            </div>
         </div>
 
         <div class="submit">
diff --git a/djangoproject/templates/accounts/user_profile.html b/djangoproject/templates/accounts/user_profile.html
index 40fd510744..2e91b211b7 100644
--- a/djangoproject/templates/accounts/user_profile.html
+++ b/djangoproject/templates/accounts/user_profile.html
@@ -43,7 +43,7 @@ <h1 class="name">
 
         {% if user_obj.profile.bio %}
             <p class="bio">
-                {{ user_obj.profile.bio }}
+                {{ user_obj.profile.bio|urlize }}
             </p>
         {% endif %}
 

From e46a5044973d7105ae74adc7e225ae54edf5c0bb Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 22 Oct 2025 01:09:47 +0000
Subject: [PATCH 15/57] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 contrib/django/forms/boundfields.py           |  1 +
 .../static/js/mod/character-counter.js        | 19 +++++++++++++------
 .../templates/accounts/edit_profile.html      |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/contrib/django/forms/boundfields.py b/contrib/django/forms/boundfields.py
index e0a9b228c3..de6ebbc9d1 100644
--- a/contrib/django/forms/boundfields.py
+++ b/contrib/django/forms/boundfields.py
@@ -1,4 +1,5 @@
 from contextlib import suppress
+
 from django.forms.boundfield import BoundField
 
 
diff --git a/djangoproject/static/js/mod/character-counter.js b/djangoproject/static/js/mod/character-counter.js
index 288857059f..05c8839057 100644
--- a/djangoproject/static/js/mod/character-counter.js
+++ b/djangoproject/static/js/mod/character-counter.js
@@ -1,6 +1,8 @@
-let CHARACTER_COUNTER_INPUT_SELECTOR_ATTR = 'data-character-counter-input-selector';
+let CHARACTER_COUNTER_INPUT_SELECTOR_ATTR =
+  'data-character-counter-input-selector';
 
-let CHARACTER_COUNTER_INDICATOR_SELECTOR_ATTR = 'data-character-counter-indicator-selector';
+let CHARACTER_COUNTER_INDICATOR_SELECTOR_ATTR =
+  'data-character-counter-indicator-selector';
 
 let CharacterCounter = function (inputElement, indicatorElement) {
   this.inputElement = inputElement;
@@ -21,18 +23,23 @@ CharacterCounter.prototype = {
       return;
     }
 
-    const remaining = this.inputElement.maxLength - this.inputElement.value.length;
+    const remaining =
+      this.inputElement.maxLength - this.inputElement.value.length;
     this.indicatorElement.innerText = String(remaining);
   },
 };
 
 function setupCharacterCounter(counterElement) {
-  let inputSelector = counterElement.getAttribute(CHARACTER_COUNTER_INPUT_SELECTOR_ATTR);
+  let inputSelector = counterElement.getAttribute(
+    CHARACTER_COUNTER_INPUT_SELECTOR_ATTR,
+  );
   if (typeof inputSelector !== 'string') {
     return;
   }
 
-  let indicatorSelector = counterElement.getAttribute(CHARACTER_COUNTER_INDICATOR_SELECTOR_ATTR);
+  let indicatorSelector = counterElement.getAttribute(
+    CHARACTER_COUNTER_INDICATOR_SELECTOR_ATTR,
+  );
   if (typeof indicatorSelector !== 'string') {
     return;
   }
@@ -52,7 +59,7 @@ function setupCharacterCounter(counterElement) {
   inputElement.addEventListener(
     'input',
     characterCounter.handleInputEvent.bind(characterCounter),
-  )
+  );
 }
 
 function setupCharacterCounters() {
diff --git a/djangoproject/templates/accounts/edit_profile.html b/djangoproject/templates/accounts/edit_profile.html
index 0de86f7b20..ba3f703506 100644
--- a/djangoproject/templates/accounts/edit_profile.html
+++ b/djangoproject/templates/accounts/edit_profile.html
@@ -4,7 +4,7 @@
 {% block title %}{% translate "Edit your profile" %}{% endblock %}
 
 {% block head_extra %}
-  <script src="{% static "js/mod/character-counter.js" %}"></script>
+    <script src="{% static "js/mod/character-counter.js" %}"></script>
 {% endblock head_extra %}
 
 {% block content %}
@@ -34,7 +34,7 @@ <h1>{% translate "Edit your profile" %}</h1>
         <div>
             {% if form.bio.errors %}
                 <p id="{{ form.bio.id_for_label }}_error" class="errors">
-                  {{ form.bio.errors.as_text }}
+                    {{ form.bio.errors.as_text }}
                 </p>
             {% endif %}
             <p>{{ form.bio }}</p>

From f1a47816344cc33f79ed5ef79cb66a72638890e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Wed, 22 Oct 2025 04:19:40 +0300
Subject: [PATCH 16/57] Fix `ngettext` usages to correctly handle singular
 forms for all languages

Co-authored-by: Baptiste Mispelon <baptiste.mispelon@torchbox.com>
---
 members/admin.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/members/admin.py b/members/admin.py
index 209bd2b60d..7790d51f35 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -55,7 +55,7 @@ def send_account_invite_mail(self, request, queryset):
             self.message_user(
                 request,
                 ngettext(
-                    "Sent account invite mail to 1 individual member.",
+                    "Sent account invite mail to %(count)d individual member.",
                     "Sent account invite mail to %(count)d individual members.",
                     sent_count,
                 )
@@ -66,8 +66,11 @@ def send_account_invite_mail(self, request, queryset):
             self.message_user(
                 request,
                 ngettext(
-                    "Failed to send account invite mail to 1 individual member.",
-                    "Failed to send account invite mail to %(count)d individual members.",
+                    "Failed to send account invite mail to %(count)d individual member.",
+                    (
+                        "Failed to send account invite mail to %(count)d individual"
+                        " members.",
+                    ),
                     failed_count,
                 )
                 % {"count": failed_count},
@@ -78,9 +81,9 @@ def send_account_invite_mail(self, request, queryset):
                 request,
                 ngettext(
                     (
-                        "Skipped sending account invite mail to 1 individual member"
-                        " (already has an account linked or an invite mail has been"
-                        " sent)."
+                        "Skipped sending account invite mail to %(count)d individual"
+                        " member (already has an account linked or an invite mail has"
+                        " been sent)."
                     ),
                     (
                         "Skipped sending account invite mail to %(count)d individual"

From 20117b6dfae638961853b5e2a52402517ac4a67b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Wed, 22 Oct 2025 10:20:43 +0300
Subject: [PATCH 17/57] Add management command
 `send_individual_member_account_invite_mails`

---
 ..._individual_member_account_invite_mails.py | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 members/management/commands/send_individual_member_account_invite_mails.py

diff --git a/members/management/commands/send_individual_member_account_invite_mails.py b/members/management/commands/send_individual_member_account_invite_mails.py
new file mode 100644
index 0000000000..a640df1cd9
--- /dev/null
+++ b/members/management/commands/send_individual_member_account_invite_mails.py
@@ -0,0 +1,45 @@
+from django.core.management.base import BaseCommand
+from django.db import transaction
+
+from ...models import IndividualMember, IndividualMemberAccountInviteSendMailStatus
+
+
+class Command(BaseCommand):
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--include-former-members",
+            action="store_true",
+            help="Include former members to the queryset.",
+        )
+
+        parser.add_argument(
+            "--no-logging",
+            action="store_true",
+            help="Disable writing results to stdout/stderr.",
+        )
+
+    def handle(self, *args, **options):
+        queryset = IndividualMember.objects.filter(
+            user_id__isnull=True,
+            account_invite_mail_sent_at__isnull=True,
+        )
+        if not options["include_former_members"]:
+            queryset = queryset.filter(member_until__isnull=True)
+        with transaction.atomic():
+            results = IndividualMember.send_account_invite_mails(queryset)
+        if not options["no_logging"]:
+            self.write_account_invite_send_mail_results(results)
+
+    def write_account_invite_send_mail_results(self, results):
+        for (
+            status_enum_member,
+            status_enum_value,
+        ) in IndividualMemberAccountInviteSendMailStatus.__members__.items():
+            count = results.get(status_enum_value, 0)
+            writer = self.stdout
+            if (
+                status_enum_value == IndividualMemberAccountInviteSendMailStatus.FAILED
+                and count > 0
+            ):
+                writer = self.stderr
+            writer.write(f"{status_enum_member}: {count}")

From 84c08268d58fc8ae5a23a40d3b8d541c03823c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Wed, 22 Oct 2025 10:29:41 +0300
Subject: [PATCH 18/57] Add management command
 `link_individual_members_to_users_by_email`

---
 ...nk_individual_members_to_users_by_email.py | 19 ++++++++++++++++++
 members/models.py                             | 20 +++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 members/management/commands/link_individual_members_to_users_by_email.py

diff --git a/members/management/commands/link_individual_members_to_users_by_email.py b/members/management/commands/link_individual_members_to_users_by_email.py
new file mode 100644
index 0000000000..17835c7fe5
--- /dev/null
+++ b/members/management/commands/link_individual_members_to_users_by_email.py
@@ -0,0 +1,19 @@
+from django.core.management.base import BaseCommand
+from django.db import transaction
+
+from ...models import IndividualMember
+
+
+class Command(BaseCommand):
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--no-logging",
+            action="store_true",
+            help="Disable writing number of updated records to stdout.",
+        )
+
+    def handle(self, *args, **options):
+        with transaction.atomic():
+            count = IndividualMember.match_and_set_users_by_email()
+        if not options["no_logging"]:
+            self.stdout.write(f"Updated: {count}")
diff --git a/members/models.py b/members/models.py
index 7254526c08..23863fe221 100644
--- a/members/models.py
+++ b/members/models.py
@@ -2,6 +2,7 @@
 from enum import StrEnum
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core import signing
 from django.core.mail import send_mail
 from django.db import models, transaction
@@ -17,6 +18,9 @@
 
 from djangoproject.thumbnails import LogoThumbnailMixin
 
+User = get_user_model()
+
+
 BRONZE_MEMBERSHIP = 1
 SILVER_MEMBERSHIP = 2
 GOLD_MEMBERSHIP = 3
@@ -83,6 +87,22 @@ class Meta:
             ),
         ]
 
+    @classmethod
+    def match_and_set_users_by_email(cls, queryset=None):
+        updated_count = 0
+        if queryset is None:
+            queryset = cls.objects.all()
+        queryset = queryset.filter(user_id__isnull=True)
+        # Wait for other active transactions to prevent race conditions.
+        queryset = queryset.select_for_update(nowait=False)
+        users_queryset = User.objects.filter(
+            email__in=queryset.values_list("email", flat=True),
+        )
+        for user in users_queryset.iterator():
+            with transaction.atomic():
+                updated_count += cls.objects.filter(email=user.email).update(user=user)
+        return updated_count
+
     @classmethod
     def send_account_invite_mails(cls, queryset):
         results = {}

From bc0467e208e72cfdfd17c13701b48bf5d9937830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Wed, 22 Oct 2025 10:41:50 +0300
Subject: [PATCH 19/57] Add migration that links individual members to users by
 email

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
---
 members/migrations/0012_auto_20251021_2353.py | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 members/migrations/0012_auto_20251021_2353.py

diff --git a/members/migrations/0012_auto_20251021_2353.py b/members/migrations/0012_auto_20251021_2353.py
new file mode 100644
index 0000000000..781d242a1d
--- /dev/null
+++ b/members/migrations/0012_auto_20251021_2353.py
@@ -0,0 +1,46 @@
+# Generated by Django 5.2.7 on 2025-10-21 23:53
+
+from django.conf import settings
+from django.db import migrations, transaction
+
+
+def link_individual_members_to_users_by_email(apps, schema_editor):
+    # These models aren't the ones imported from the `models.py` files.
+    # They're fake, and constructed based on the historical migrations.
+    # Ensure that the `Migration.dependencies` contains the migrations needed to
+    # construct the models that are used here.
+    IndividualMember = apps.get_model("members.IndividualMember")
+    User = apps.get_model(settings.AUTH_USER_MODEL)
+
+    individual_members_queryset = IndividualMember.objects.filter(
+        user_id__isnull=True,
+    ).select_for_update(
+        nowait=False,
+    )
+    users_queryset = User.objects.filter(
+        email__in=individual_members_queryset.values_list("email", flat=True),
+    )
+    for user in users_queryset.iterator():
+        with transaction.atomic():
+            IndividualMember.objects.filter(email=user.email).update(user=user)
+
+
+def noop(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("members", "0011_alter_individualmember_options_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            link_individual_members_to_users_by_email,
+            # Don't raise `django.db.migrations.exceptions.IrreversibleError`
+            # when reverting to an older migration.
+            reverse_code=noop,
+        ),
+    ]

From 7365e8b160051d3479d17ccf26038dc4c5215053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 00:35:06 +0300
Subject: [PATCH 20/57] Add tests for displaying user bio in profile

---
 accounts/tests.py | 57 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 55 insertions(+), 2 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index a327e25748..106792a4ee 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -6,6 +6,7 @@
 from django_hosts.resolvers import reverse
 
 from accounts.forms import DeleteProfileForm
+from accounts.models import Profile
 from foundation import models as foundationmodels
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
@@ -17,8 +18,22 @@ class UserProfileTests(TracDBCreateDatabaseMixin, TestCase):
 
     @classmethod
     def setUpTestData(cls):
-        User.objects.create_user(username="user1", password="password")
-        User.objects.create_user(username="user2", password="password")
+        user1_bio = "\n".join(
+            [
+                "[pre]",
+                "\n",
+                "Email: user1@example.com",
+                "Website: user1.example.com",
+                "GitHub: https://github.com/ghost",
+                "\n",
+                "[post]",
+            ],
+        )
+        user2_bio = ""
+        user1 = User.objects.create_user(username="user1", password="password")
+        user2 = User.objects.create_user(username="user2", password="password")
+        Profile.objects.create(user=user1, bio=user1_bio)
+        Profile.objects.create(user=user2, bio=user2_bio)
         cls.user1_url = reverse("user_profile", args=["user1"])
         cls.user2_url = reverse("user_profile", args=["user2"])
 
@@ -26,6 +41,44 @@ def test_username_is_page_title(self):
         response = self.client.get(self.user1_url)
         self.assertContains(response, '<h1 class="name">user1</h1>', html=True)
 
+    def test_page_displays_bio_when_present(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(response, '<p class="bio">')
+
+    def test_page_hides_bio_when_absent(self):
+        response = self.client.get(self.user2_url)
+        self.assertNotContains(response, '<p class="bio">')
+
+    def test_bio_contains_mail_addresses_clickable(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(
+            response,
+            '<a href="mailto:user1@example.com">user1@example.com</a>',
+            html=True,
+        )
+
+    def test_bio_contains_links_without_protocol_clickable(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(
+            response,
+            (
+                '<a href="http://user1.example.com" rel="nofollow">'
+                "user1.example.com</a>"
+            ),
+            html=True,
+        )
+
+    def test_bio_contains_links_with_protocol_clickable(self):
+        response = self.client.get(self.user1_url)
+        self.assertContains(
+            response,
+            (
+                '<a href="https://github.com/ghost" rel="nofollow">'
+                "https://github.com/ghost</a>"
+            ),
+            html=True,
+        )
+
     def test_stat_commits(self):
         Revision.objects.create(
             author="user1",

From 46cb8cd384d0fbdd85d363063813a3a915c0f52e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 01:32:36 +0300
Subject: [PATCH 21/57] Convert `contrib.django.forms` module into an app for
 testing

---
 Makefile                         | 2 +-
 contrib/django/forms/apps.py     | 6 ++++++
 djangoproject/settings/common.py | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 contrib/django/forms/apps.py

diff --git a/Makefile b/Makefile
index 910ce300e4..d194739d5f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: all ci clean collectstatics compile-scss compile-scss-debug install run test watch-scss
 
-APP_LIST ?= accounts aggregator blog contact dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
+APP_LIST ?= accounts aggregator blog contact contrib.django.forms dashboard djangoproject docs foundation fundraising legacy members releases svntogit tracdb
 SCSS = djangoproject/scss
 STATIC = djangoproject/static
 
diff --git a/contrib/django/forms/apps.py b/contrib/django/forms/apps.py
new file mode 100644
index 0000000000..9359fe7651
--- /dev/null
+++ b/contrib/django/forms/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class FormsContribConfig(AppConfig):
+    label = "forms_contrib"
+    name = "contrib.django.forms"
diff --git a/djangoproject/settings/common.py b/djangoproject/settings/common.py
index 09be7f8461..2620284295 100644
--- a/djangoproject/settings/common.py
+++ b/djangoproject/settings/common.py
@@ -63,6 +63,7 @@
     "aggregator",
     "blog",
     "contact",
+    "contrib.django.forms",
     "dashboard",
     "docs",
     "foundation",

From a69e9e148ef49ef9b1bb06e42c4fa50cb7e3787c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 01:54:08 +0300
Subject: [PATCH 22/57] Add note to describe why we need value normalization in
 the `BoundFieldWithCharacterCounter.get_characters_remaining_count` method

---
 contrib/django/forms/boundfields.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contrib/django/forms/boundfields.py b/contrib/django/forms/boundfields.py
index de6ebbc9d1..4a4ef0aec7 100644
--- a/contrib/django/forms/boundfields.py
+++ b/contrib/django/forms/boundfields.py
@@ -11,6 +11,16 @@ def get_characters_remaining_count(self):
         with suppress(TypeError, ValueError):
             max_length = int(self.field.max_length)
         if isinstance(max_length, int):
-            value = self.value().replace("\r\n", "\n").replace("\r", "\n")
+            value = self.value()
+            if value is None:
+                return max_length
+
+            # Sometimes, when this method runs, Django may not have normalized
+            # the value yet, so it causes length mismatch between the server
+            # and the browser, because of the line ending characters.
+            #
+            # Ensure the value is normalized.
+            value = value.replace("\r\n", "\n").replace("\r", "\n")
+
             characters_remaining_count = max_length - len(value)
         return characters_remaining_count

From 85c211d737a54bf5d8df2810c96bcdb9d0e42a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 01:55:43 +0300
Subject: [PATCH 23/57] Add tests for `BoundFieldWithCharacterCounter` class

---
 contrib/django/forms/tests.py | 80 +++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 contrib/django/forms/tests.py

diff --git a/contrib/django/forms/tests.py b/contrib/django/forms/tests.py
new file mode 100644
index 0000000000..3c533d787f
--- /dev/null
+++ b/contrib/django/forms/tests.py
@@ -0,0 +1,80 @@
+from random import randint
+from unittest import TestCase
+
+from django.forms import Form, fields
+
+from .boundfields import BoundFieldWithCharacterCounter
+
+
+class BoundFieldWithCharacterCounterTests(TestCase):
+
+    @classmethod
+    def prepare_sample_form_class(cls, max_length=None):
+        class SampleFormContainsBoundFieldWithCharacterCounter(Form):
+            content = fields.CharField(
+                max_length=max_length,
+                bound_field_class=BoundFieldWithCharacterCounter,
+            )
+
+            class Meta:
+                fields = ["content"]
+
+        return SampleFormContainsBoundFieldWithCharacterCounter
+
+    @classmethod
+    def prepare_sample_bound_field(cls, max_length=None, content=None):
+        form_class = cls.prepare_sample_form_class(max_length=max_length)
+        form = form_class(data={"content": content})
+        bound_field = form.fields["content"].get_bound_field(form, "content")
+        return bound_field
+
+    def test_get_characters_remaining_count_is_callable(self):
+        bound_field = self.__class__.prepare_sample_bound_field()
+        self.assertTrue(
+            hasattr(bound_field, "get_characters_remaining_count"),
+            "Bound field does not have `get_characters_remaining_count` method",
+        )
+        self.assertTrue(
+            callable(bound_field.get_characters_remaining_count),
+            "Expected `get_characters_remaining_count` to be callable, but it's not",
+        )
+
+    def test_characters_remaining_count_without_max_length(self):
+        bound_field = self.__class__.prepare_sample_bound_field(max_length=None)
+        remaining_count = bound_field.get_characters_remaining_count()
+        self.assertIsNone(remaining_count)
+
+    def test_characters_remaining_count_with_max_length(self):
+        max_length = randint(0, 500)
+        bound_field = self.__class__.prepare_sample_bound_field(max_length=max_length)
+        remaining_count = bound_field.get_characters_remaining_count()
+        self.assertGreaterEqual(remaining_count, 0)
+        self.assertEqual(remaining_count, max_length)
+
+    def test_characters_remaining_is_negative_when_content_exceeds_max_length(self):
+        max_length = randint(0, 500)
+        content_length = max_length + 1
+        content = "*" * content_length
+        bound_field = self.__class__.prepare_sample_bound_field(
+            max_length=max_length,
+            content=content,
+        )
+        remaining_count = bound_field.get_characters_remaining_count()
+        self.assertLess(remaining_count, 0)
+        self.assertEqual(remaining_count, max_length - content_length)
+
+    def test_characters_remaining_matches_client_side_js_implementation(self):
+        ending = "\r\n\r\r\n"
+        max_length = randint(0, 500)
+        visual_content_length = max_length - len(ending)
+        visual_content = "*" * visual_content_length
+        content = visual_content + ending
+        normalized_ending = ending.replace("\r\n", "\n").replace("\r", "\n")
+        normalized_content = visual_content + normalized_ending
+        bound_field = self.__class__.prepare_sample_bound_field(
+            max_length=max_length,
+            content=content,
+        )
+        remaining_count = bound_field.get_characters_remaining_count()
+        self.assertGreater(remaining_count, 0)
+        self.assertEqual(remaining_count, max_length - len(normalized_content))

From 65950f7cc2381d099fdea61211f17f942a06f1de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 02:32:27 +0300
Subject: [PATCH 24/57] Add tests for `edit_profile` view

---
 accounts/tests.py | 58 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 7 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index 106792a4ee..0a42cd69be 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -1,8 +1,9 @@
 import hashlib
+from random import randint
 
 from django.contrib.auth.models import AnonymousUser, User
 from django.core.cache import cache
-from django.test import TestCase, override_settings
+from django.test import RequestFactory, TestCase, override_settings
 from django_hosts.resolvers import reverse
 
 from accounts.forms import DeleteProfileForm
@@ -11,6 +12,9 @@
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
 
+from .forms import ProfileForm
+from .views import edit_profile
+
 
 @override_settings(TRAC_URL="https://code.djangoproject.com/")
 class UserProfileTests(TracDBCreateDatabaseMixin, TestCase):
@@ -164,25 +168,25 @@ def test_stat_tickets_triaged(self):
             author="user1",
             newvalue="Accepted",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
         TicketChange.objects.create(
             author="user1",
             newvalue="Someday/Maybe",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
         TicketChange.objects.create(
             author="user1",
             newvalue="Ready for checkin",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
         TicketChange.objects.create(
             author="user2",
             newvalue="Accepted",
             ticket=Ticket.objects.create(),
-            **initial_ticket_values
+            **initial_ticket_values,
         )
 
         response = self.client.get(self.user1_url)
@@ -198,13 +202,13 @@ def test_stat_tickets_triaged_unaccepted_not_counted(self):
             oldvalue="Unreviewed",
             newvalue="Accepted",
             ticket=Ticket.objects.create(),
-            **common_ticket_values
+            **common_ticket_values,
         )
         TicketChange.objects.create(
             oldvalue="Accepted",
             newvalue="Unreviewed",
             ticket=Ticket.objects.create(),
-            **common_ticket_values
+            **common_ticket_values,
         )
 
         response = self.client.get(self.user1_url)
@@ -228,6 +232,46 @@ def test_caches_trac_stats(self):
         self.assertIsNotNone(cache.get(key))
 
 
+class UserProfileUpdateFormTests(TestCase):
+    def setUp(self):
+        self.request_factory = RequestFactory()
+        self.edit_profile_url = reverse("edit_profile")
+
+    def test_bio_field_has_max_length(self):
+        form = ProfileForm()
+        self.assertIsNotNone(
+            form.fields["bio"].max_length,
+            "`ProfileForm.bio` field does not have `max_length` specified",
+        )
+
+    def test_page_shows_characters_remaining_count_for_bio(self):
+        profile_edit_form = ProfileForm()
+        bio_field = profile_edit_form.fields["bio"]
+        bio_length = randint(0, bio_field.max_length)
+        bio = "*" * bio_length
+        expected_characters_remaining_count = bio_field.max_length - bio_length
+        self.assertGreaterEqual(expected_characters_remaining_count, 0)
+        user = User.objects.create_user(username="user", password="password")
+        Profile.objects.create(user=user, bio=bio)
+        request = self.request_factory.get(self.edit_profile_url)
+        request.user = user
+        response = edit_profile(request)
+        self.assertContains(
+            response,
+            "<span>Characters remaining:</span>",
+            html=True,
+        )
+        self.assertContains(
+            response,
+            f"""
+                                class="character-counter__indicator"
+                            >
+                                {expected_characters_remaining_count}
+                            </span>
+            """.strip(),
+        )
+
+
 class ViewsTests(TestCase):
 
     def test_login_redirect(self):

From 9fc7fd11fb47ea010d79089eea95acf6d1ffcf7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 03:25:38 +0300
Subject: [PATCH 25/57] Add test for
 `IndividualMember.match_and_set_users_by_email` classmethod

---
 members/test_models.py | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/members/test_models.py b/members/test_models.py
index 7872302186..e31d88ff75 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -1,5 +1,7 @@
 from datetime import date, timedelta
+from random import randint
 
+from django.contrib.auth import get_user_model
 from django.test import TestCase
 
 from members.models import (
@@ -11,6 +13,8 @@
     Team,
 )
 
+User = get_user_model()
+
 
 class IndividualMemberTests(TestCase):
     @classmethod
@@ -33,6 +37,43 @@ def test_is_active(self):
         self.member.member_until = date.today()
         self.assertFalse(self.member.is_active)
 
+    def test_match_and_set_users_by_email(self):
+        members_count = randint(2, 20)
+        user_pk_to_email_mapping = {}
+        for i in range(members_count):
+            username = f"user{i}"
+            email = f"{username}@example.com"
+            user = User.objects.create_user(
+                username=username,
+                email=email,
+                password="password",
+            )
+            user_pk_to_email_mapping[user.pk] = email
+            IndividualMember.objects.create(
+                name=f"User {i}",
+                email=email,
+            )
+        self.assertEqual(
+            IndividualMember.objects.filter(
+                user_id__isnull=True,
+                email__in=user_pk_to_email_mapping.values(),
+            ).count(),
+            members_count,
+        )
+        IndividualMember.match_and_set_users_by_email()
+        individual_member_queryset = IndividualMember.objects.filter(
+            user_id__in=user_pk_to_email_mapping.keys(),
+        )
+        self.assertEqual(
+            individual_member_queryset.count(),
+            members_count,
+        )
+        for individual_member in individual_member_queryset.iterator():
+            self.assertEqual(
+                individual_member.email,
+                user_pk_to_email_mapping[individual_member.user_id],
+            )
+
 
 class CorporateMemberTests(TestCase):
     today = date.today()

From bb963f60ed31ef6350e2933ebded1d4e94b55967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 03:45:42 +0300
Subject: [PATCH 26/57] Add test for
 `IndividualMember.send_account_invite_mails` classmethod

---
 members/test_models.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/members/test_models.py b/members/test_models.py
index e31d88ff75..a01f320925 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -2,6 +2,7 @@
 from random import randint
 
 from django.contrib.auth import get_user_model
+from django.core import mail
 from django.test import TestCase
 
 from members.models import (
@@ -10,6 +11,7 @@
     SILVER_MEMBERSHIP,
     CorporateMember,
     IndividualMember,
+    IndividualMemberAccountInviteSendMailStatus,
     Team,
 )
 
@@ -74,6 +76,34 @@ def test_match_and_set_users_by_email(self):
                 user_pk_to_email_mapping[individual_member.user_id],
             )
 
+    def test_send_account_invite_mails(self):
+        individual_members_count = randint(1, 5)
+        individual_member_pks = set()
+        for i in range(individual_members_count):
+            username = f"user{i}"
+            email = f"{username}@example.com"
+            individual_member = IndividualMember.objects.create(
+                name=f"User {i}",
+                email=email,
+            )
+            individual_member_pks.add(individual_member.pk)
+        self.assertEqual(len(mail.outbox), 0)
+        results = IndividualMember.send_account_invite_mails(
+            IndividualMember.objects.filter(
+                pk__in=individual_member_pks,
+            )
+        )
+        self.assertEqual(len(results), 1)
+        self.assertEqual(
+            next(iter(results.keys())),
+            IndividualMemberAccountInviteSendMailStatus.SENT,
+        )
+        self.assertEqual(
+            results[IndividualMemberAccountInviteSendMailStatus.SENT],
+            individual_members_count,
+        )
+        self.assertEqual(len(mail.outbox), individual_members_count)
+
 
 class CorporateMemberTests(TestCase):
     today = date.today()

From 2588d94f68f6158821606587d601b9626ea470e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 03:56:21 +0300
Subject: [PATCH 27/57] Add test for
 `IndividualMember.send_account_invite_mail` method

---
 members/test_models.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/members/test_models.py b/members/test_models.py
index a01f320925..663722f5bd 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -4,6 +4,7 @@
 from django.contrib.auth import get_user_model
 from django.core import mail
 from django.test import TestCase
+from django.urls import reverse
 
 from members.models import (
     GOLD_MEMBERSHIP,
@@ -104,6 +105,23 @@ def test_send_account_invite_mails(self):
         )
         self.assertEqual(len(mail.outbox), individual_members_count)
 
+    def test_send_account_invite_mail(self):
+        individual_member = IndividualMember.objects.create(
+            name=f"Member 1",
+            email="member1@example.com",
+        )
+        self.assertEqual(len(mail.outbox), 0)
+        status = individual_member.send_account_invite_mail()
+        self.assertEqual(
+            status,
+            IndividualMemberAccountInviteSendMailStatus.SENT,
+        )
+        self.assertEqual(len(mail.outbox), 1)
+        email_message = mail.outbox.pop()
+        self.assertIn(individual_member.email, email_message.to)
+        self.assertIn(individual_member.name, email_message.body)
+        self.assertIn(reverse("registration_register"), email_message.body)
+
 
 class CorporateMemberTests(TestCase):
     today = date.today()

From 94ba0678cbeb837d1a767fdbf7037390117585a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 04:00:49 +0300
Subject: [PATCH 28/57] Fix Flake8 F541 (f-string is missing placeholders)
 error

---
 members/test_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/members/test_models.py b/members/test_models.py
index 663722f5bd..3906b2055c 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -107,7 +107,7 @@ def test_send_account_invite_mails(self):
 
     def test_send_account_invite_mail(self):
         individual_member = IndividualMember.objects.create(
-            name=f"Member 1",
+            name="Member 1",
             email="member1@example.com",
         )
         self.assertEqual(len(mail.outbox), 0)

From 81d71373e477b183b28def91568521418420f8ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 05:25:16 +0300
Subject: [PATCH 29/57] Add test to verify
 `IndividualMember.send_account_invite_mails` prevents race-conditions

---
 members/test_models.py | 72 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/members/test_models.py b/members/test_models.py
index 3906b2055c..7e9e415842 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -1,9 +1,13 @@
+from concurrent.futures import ThreadPoolExecutor
+from contextlib import ExitStack
 from datetime import date, timedelta
 from random import randint
+from multiprocessing import cpu_count as get_cpu_count
 
 from django.contrib.auth import get_user_model
 from django.core import mail
-from django.test import TestCase
+from django.db import connections, transaction
+from django.test import TestCase, TransactionTestCase
 from django.urls import reverse
 
 from members.models import (
@@ -123,6 +127,72 @@ def test_send_account_invite_mail(self):
         self.assertIn(reverse("registration_register"), email_message.body)
 
 
+class IndividualMemberTransactionTests(TransactionTestCase):
+    def test_send_account_invite_mails_prevents_race_condition(self):
+        # Try to find the ideal number of processes/workers for the
+        # current machine.
+        cpu_count = get_cpu_count()
+        processes_count = max(min(4 * cpu_count, 64), 8)
+        workers_count = max(min(cpu_count * 2 + 1, 8), 16)
+        individual_members_count = randint(5, 10)
+        individual_member_pks = set()
+        for i in range(individual_members_count):
+            individual_member = IndividualMember.objects.create(
+                name=f"User {i}",
+                email=f"user{i}@example.com",
+            )
+            individual_member_pks.add(individual_member.pk)
+        individual_members_queryset = IndividualMember.objects.filter(
+            pk__in=individual_member_pks,
+        )
+
+        def execute_send_account_invite_mails_task():
+            # This is a thread entry point. Note that Django doesn't close
+            # our custom connections created in separated threads, which
+            # causes `django.db.utils.OperationalError` to be raised with
+            # message "There are N other sessions using the database" in most
+            # cases.
+            #
+            # Ensure all the connections are closed at the end.
+            with ExitStack() as exit_stack:
+                exit_stack.callback(connections.close_all)
+                with transaction.atomic():
+                    return IndividualMember.send_account_invite_mails(
+                        individual_members_queryset,
+                    )
+
+        futures = []
+        with ThreadPoolExecutor(max_workers=workers_count) as executor:
+            for i in range(processes_count):
+                futures.append(
+                    executor.submit(execute_send_account_invite_mails_task),
+                )
+        results_list = []
+        for future in futures:
+            results_list.append(future.result())
+        status_aggregation = {}
+        for results in results_list:
+            for key, value in results.items():
+                if key not in status_aggregation:
+                    status_aggregation[key] = value
+                else:
+                    status_aggregation[key] += value
+        self.assertEqual(
+            status_aggregation.get(
+                IndividualMemberAccountInviteSendMailStatus.SENT,
+                0,
+            ),
+            individual_members_count,
+        )
+        self.assertEqual(
+            status_aggregation.get(
+                IndividualMemberAccountInviteSendMailStatus.SKIPPED,
+                0,
+            ),
+            individual_members_count * (processes_count - 1),
+        )
+
+
 class CorporateMemberTests(TestCase):
     today = date.today()
     tomorrow = today + timedelta(days=1)

From db9a7dd3f546d4989cc3add5fc65c8b2d6d3fd14 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 23 Oct 2025 02:25:41 +0000
Subject: [PATCH 30/57] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 members/test_models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/members/test_models.py b/members/test_models.py
index 7e9e415842..f9b1afca76 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -1,8 +1,8 @@
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import ExitStack
 from datetime import date, timedelta
-from random import randint
 from multiprocessing import cpu_count as get_cpu_count
+from random import randint
 
 from django.contrib.auth import get_user_model
 from django.core import mail

From aa9d1cb5de15e25ffd3efba975fd0d4361bcce70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 05:34:59 +0300
Subject: [PATCH 31/57] Reduce resource usage of some tests

---
 accounts/tests.py             | 7 ++-----
 contrib/django/forms/tests.py | 6 +++---
 members/test_models.py        | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index 0a42cd69be..1dab8a9461 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -239,15 +239,12 @@ def setUp(self):
 
     def test_bio_field_has_max_length(self):
         form = ProfileForm()
-        self.assertIsNotNone(
-            form.fields["bio"].max_length,
-            "`ProfileForm.bio` field does not have `max_length` specified",
-        )
+        self.assertIsInstance(form.fields["bio"].max_length, int)
 
     def test_page_shows_characters_remaining_count_for_bio(self):
         profile_edit_form = ProfileForm()
         bio_field = profile_edit_form.fields["bio"]
-        bio_length = randint(0, bio_field.max_length)
+        bio_length = randint(0, max(bio_field.max_length, 20))
         bio = "*" * bio_length
         expected_characters_remaining_count = bio_field.max_length - bio_length
         self.assertGreaterEqual(expected_characters_remaining_count, 0)
diff --git a/contrib/django/forms/tests.py b/contrib/django/forms/tests.py
index 3c533d787f..ec3c574ece 100644
--- a/contrib/django/forms/tests.py
+++ b/contrib/django/forms/tests.py
@@ -45,14 +45,14 @@ def test_characters_remaining_count_without_max_length(self):
         self.assertIsNone(remaining_count)
 
     def test_characters_remaining_count_with_max_length(self):
-        max_length = randint(0, 500)
+        max_length = randint(0, 20)
         bound_field = self.__class__.prepare_sample_bound_field(max_length=max_length)
         remaining_count = bound_field.get_characters_remaining_count()
         self.assertGreaterEqual(remaining_count, 0)
         self.assertEqual(remaining_count, max_length)
 
     def test_characters_remaining_is_negative_when_content_exceeds_max_length(self):
-        max_length = randint(0, 500)
+        max_length = randint(0, 20)
         content_length = max_length + 1
         content = "*" * content_length
         bound_field = self.__class__.prepare_sample_bound_field(
@@ -65,7 +65,7 @@ def test_characters_remaining_is_negative_when_content_exceeds_max_length(self):
 
     def test_characters_remaining_matches_client_side_js_implementation(self):
         ending = "\r\n\r\r\n"
-        max_length = randint(0, 500)
+        max_length = randint(0, 20)
         visual_content_length = max_length - len(ending)
         visual_content = "*" * visual_content_length
         content = visual_content + ending
diff --git a/members/test_models.py b/members/test_models.py
index f9b1afca76..2ad0e208c3 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -45,7 +45,7 @@ def test_is_active(self):
         self.assertFalse(self.member.is_active)
 
     def test_match_and_set_users_by_email(self):
-        members_count = randint(2, 20)
+        members_count = randint(2, 8)
         user_pk_to_email_mapping = {}
         for i in range(members_count):
             username = f"user{i}"

From f37e3f85eda904b124b7e607c07f440996cf944e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 06:25:58 +0300
Subject: [PATCH 32/57] Add note to account-invite mail about matching GitHub
 username for Trac stats

---
 djangoproject/templates/members/email/account_invite.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/djangoproject/templates/members/email/account_invite.txt b/djangoproject/templates/members/email/account_invite.txt
index 9de1b73dc5..7448529bff 100644
--- a/djangoproject/templates/members/email/account_invite.txt
+++ b/djangoproject/templates/members/email/account_invite.txt
@@ -7,6 +7,8 @@ To have your name linked, please create an account (if you don't already have on
 
 {% url 'registration_register' %}
 
+Note: If you log in to Trac with your GitHub account, your djangoproject.com username should match your GitHub username for certain stats to appear on your profile.
+
 Once your account is ready, let us know your username so we can connect it to the members list.
 
 This small step helps the community grow more connected and makes it easier for everyone to explore and engage with it.

From ef54d5b4ca39376f69e3e235235774bd36c0bce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 06:27:49 +0300
Subject: [PATCH 33/57] Update subject of Individual Membership account-invite
 mail

---
 members/models.py      | 2 +-
 members/test_models.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/members/models.py b/members/models.py
index 23863fe221..3dff37f4da 100644
--- a/members/models.py
+++ b/members/models.py
@@ -126,7 +126,7 @@ def is_active(self):
     def send_account_invite_mail(self):
         if self.user_id or self.account_invite_mail_sent_at:
             return IndividualMemberAccountInviteSendMailStatus.SKIPPED
-        mail_subject = "Make your Django Individual Membership profile visible"
+        mail_subject = "Django Individual Membership - Account Setup"
         mail_content = render_to_string(
             "members/email/account_invite.txt",
             {
diff --git a/members/test_models.py b/members/test_models.py
index 2ad0e208c3..eb7e35d667 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -123,7 +123,11 @@ def test_send_account_invite_mail(self):
         self.assertEqual(len(mail.outbox), 1)
         email_message = mail.outbox.pop()
         self.assertIn(individual_member.email, email_message.to)
-        self.assertIn(individual_member.name, email_message.body)
+        self.assertEqual(
+            email_message.subject,
+            "Django Individual Membership - Account Setup",
+        )
+        self.assertIn(f"Hello {individual_member.name},", email_message.body)
         self.assertIn(reverse("registration_register"), email_message.body)
 
 

From b956bfb0a1cc3ff684192e6426700e0d06f1ea0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 08:08:18 +0300
Subject: [PATCH 34/57] Introduce `get_trac_username` function (please see the
 commit message for details)

- Add `accounts.Profile.trac_username` field.
- Add `ProfileAdmin` to enable overriding Trac username for a specific user.
- Refactor `user_profile` view to use `get_trac_username` function.

Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
---
 accounts/admin.py                             | 32 ++++++++++++++++++
 .../migrations/0004_profile_trac_username.py  | 20 +++++++++++
 accounts/models.py                            |  7 ++++
 accounts/tests.py                             | 33 ++++++++++++++++++-
 accounts/views.py                             |  8 +++--
 tracdb/utils.py                               | 11 +++++++
 6 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 accounts/admin.py
 create mode 100644 accounts/migrations/0004_profile_trac_username.py
 create mode 100644 tracdb/utils.py

diff --git a/accounts/admin.py b/accounts/admin.py
new file mode 100644
index 0000000000..a1717330b5
--- /dev/null
+++ b/accounts/admin.py
@@ -0,0 +1,32 @@
+from django import forms
+from django.contrib import admin
+from django.utils.translation import gettext_lazy as _
+
+from .forms import ProfileForm
+from .models import Profile
+
+
+class ProfileAdminForm(forms.ModelForm):
+    class Meta:
+        model = Profile
+        fields = "__all__"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["bio"].widget.attrs["maxlength"] = ProfileForm.base_fields[
+            "bio"
+        ].max_length
+        self.fields["bio"].help_text = ProfileForm.base_fields["bio"].help_text
+
+
+@admin.register(Profile)
+class ProfileAdmin(admin.ModelAdmin):
+    list_display = [
+        "user__username",
+        "name",
+        "trac_username",
+    ]
+    list_select_related = ["user"]
+    search_fields = ["user__username", "name", "trac_username"]
+    form = ProfileAdminForm
+    autocomplete_fields = ["user"]
diff --git a/accounts/migrations/0004_profile_trac_username.py b/accounts/migrations/0004_profile_trac_username.py
new file mode 100644
index 0000000000..c350d4e4e8
--- /dev/null
+++ b/accounts/migrations/0004_profile_trac_username.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.2.7 on 2025-10-22 23:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0003_profile_bio"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="profile",
+            name="trac_username",
+            field=models.CharField(
+                blank=True, db_index=True, default="", max_length=150
+            ),
+        ),
+    ]
diff --git a/accounts/models.py b/accounts/models.py
index 63eb1013f8..5f76ea16ba 100644
--- a/accounts/models.py
+++ b/accounts/models.py
@@ -6,6 +6,13 @@ class Profile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
     name = models.CharField(max_length=200, blank=True)
     bio = models.TextField(blank=True)
+    trac_username = models.CharField(
+        max_length=150,
+        blank=True,
+        null=False,
+        default="",
+        db_index=True,
+    )
 
     def __str__(self):
         return self.name or str(self.user)
diff --git a/accounts/tests.py b/accounts/tests.py
index 1dab8a9461..e4553610ab 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -83,6 +83,26 @@ def test_bio_contains_links_with_protocol_clickable(self):
             html=True,
         )
 
+    def test_trac_username_overrides_user_username(self):
+        djangoproject_username = "djangoproject_user"
+        trac_username = "trac_user"
+        user = User.objects.create_user(username=djangoproject_username)
+        Profile.objects.create(user=user, trac_username=trac_username)
+        Revision.objects.create(
+            author=trac_username,
+            rev="91c879eda595c12477bbfa6f51115e88b75ddf88",
+            _time=1731669560,
+        )
+
+        user_profile_url = reverse("user_profile", args=[djangoproject_username])
+        user_profile_response = self.client.get(user_profile_url)
+        self.assertContains(
+            user_profile_response,
+            '<a href="https://github.com/django/django/commits/main/'
+            f'?author={trac_username}">Commits: 1.</a>',
+            html=True,
+        )
+
     def test_stat_commits(self):
         Revision.objects.create(
             author="user1",
@@ -223,7 +243,7 @@ def test_stat_tickets_triaged_unaccepted_not_counted(self):
         }
     )
     def test_caches_trac_stats(self):
-        key = "user_vital_status:%s" % hashlib.md5(b"user1").hexdigest()
+        key = "trac_user_vital_status:%s" % hashlib.md5(b"user1").hexdigest()
 
         self.assertIsNone(cache.get(key))
 
@@ -237,6 +257,17 @@ def setUp(self):
         self.request_factory = RequestFactory()
         self.edit_profile_url = reverse("edit_profile")
 
+    def test_trac_username_field_is_excluded(self):
+        form = ProfileForm()
+        self.assertNotIn(
+            "trac_username",
+            form.fields,
+            (
+                "`ProfileForm` includes the field `trac_username`."
+                " This may lead to security vulnerabilities."
+            ),
+        )
+
     def test_bio_field_has_max_length(self):
         form = ProfileForm()
         self.assertIsInstance(form.fields["bio"].max_length, int)
diff --git a/accounts/views.py b/accounts/views.py
index 18442c9448..4f63e6211a 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -8,6 +8,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 
 from tracdb import stats as trac_stats
+from tracdb.utils import get_trac_username
 
 from .forms import DeleteProfileForm, ProfileForm
 from .models import Profile
@@ -72,11 +73,12 @@ def delete_profile_success(request):
 
 
 def get_user_stats(user):
-    username = user.username.encode("ascii", "ignore")
-    key = "user_vital_status:%s" % hashlib.md5(username).hexdigest()
+    trac_username = get_trac_username(user)
+    encoded_trac_username = trac_username.encode("ascii", "ignore")
+    key = "trac_user_vital_status:%s" % hashlib.md5(encoded_trac_username).hexdigest()
     info = cache.get(key)
     if info is None:
-        info = trac_stats.get_user_stats(user.username)
+        info = trac_stats.get_user_stats(trac_username)
         # Hide any stat with a value = 0 so that we don't accidentally insult
         # non-contributors.
         for k, v in list(info.items()):
diff --git a/tracdb/utils.py b/tracdb/utils.py
new file mode 100644
index 0000000000..be9049e5bb
--- /dev/null
+++ b/tracdb/utils.py
@@ -0,0 +1,11 @@
+from contextlib import suppress
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
+
+
+def get_trac_username(user):
+    with suppress(User.profile.RelatedObjectDoesNotExist):
+        if user.profile.trac_username:
+            return user.profile.trac_username
+    return user.username

From f9227108439901039a9c44cf7d91fa6e2a996fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 08:19:12 +0300
Subject: [PATCH 35/57] Rename `get_trac_username` to `get_user_trac_username`

---
 accounts/views.py | 4 ++--
 tracdb/utils.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/accounts/views.py b/accounts/views.py
index 4f63e6211a..0fcfc9d1e9 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -8,7 +8,7 @@
 from django.shortcuts import get_object_or_404, redirect, render
 
 from tracdb import stats as trac_stats
-from tracdb.utils import get_trac_username
+from tracdb.utils import get_user_trac_username
 
 from .forms import DeleteProfileForm, ProfileForm
 from .models import Profile
@@ -73,7 +73,7 @@ def delete_profile_success(request):
 
 
 def get_user_stats(user):
-    trac_username = get_trac_username(user)
+    trac_username = get_user_trac_username(user)
     encoded_trac_username = trac_username.encode("ascii", "ignore")
     key = "trac_user_vital_status:%s" % hashlib.md5(encoded_trac_username).hexdigest()
     info = cache.get(key)
diff --git a/tracdb/utils.py b/tracdb/utils.py
index be9049e5bb..763e6d7aae 100644
--- a/tracdb/utils.py
+++ b/tracdb/utils.py
@@ -4,7 +4,7 @@
 User = get_user_model()
 
 
-def get_trac_username(user):
+def get_user_trac_username(user):
     with suppress(User.profile.RelatedObjectDoesNotExist):
         if user.profile.trac_username:
             return user.profile.trac_username

From a0f2d473fabc984718641b0bd597701bc46b139d Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Thu, 23 Oct 2025 05:19:37 +0000
Subject: [PATCH 36/57] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 tracdb/utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tracdb/utils.py b/tracdb/utils.py
index 763e6d7aae..5e618e4b67 100644
--- a/tracdb/utils.py
+++ b/tracdb/utils.py
@@ -1,4 +1,5 @@
 from contextlib import suppress
+
 from django.contrib.auth import get_user_model
 
 User = get_user_model()

From b91a2a0ccf620012c68ae5b19d6ad9ded2d8f62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Thu, 23 Oct 2025 08:37:19 +0300
Subject: [PATCH 37/57] Fix Flake8 F401 (imported but unused) error

---
 accounts/admin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/accounts/admin.py b/accounts/admin.py
index a1717330b5..c90ab4e72d 100644
--- a/accounts/admin.py
+++ b/accounts/admin.py
@@ -1,6 +1,5 @@
 from django import forms
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
 
 from .forms import ProfileForm
 from .models import Profile

From 26eed0042be7f0a4510af7014824aa9d910e26f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 01:41:51 +0300
Subject: [PATCH 38/57] Reduce resource usage of
 `IndividualMemberTransactionTests.test_send_account_invite_mails_prevents_race_condition`

---
 members/test_models.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/members/test_models.py b/members/test_models.py
index eb7e35d667..bd3d671cba 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -171,11 +171,9 @@ def execute_send_account_invite_mails_task():
                 futures.append(
                     executor.submit(execute_send_account_invite_mails_task),
                 )
-        results_list = []
-        for future in futures:
-            results_list.append(future.result())
         status_aggregation = {}
-        for results in results_list:
+        for future in futures:
+            results = future.result()
             for key, value in results.items():
                 if key not in status_aggregation:
                     status_aggregation[key] = value

From c9cc83efd3cb7956281ce9df0f029b410ca04a64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 02:02:54 +0300
Subject: [PATCH 39/57] Add tests to ensure overriding user's Trac username
 works for every type of stats

---
 accounts/tests.py | 131 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 115 insertions(+), 16 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index e4553610ab..f89be95a0d 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -11,6 +11,7 @@
 from foundation import models as foundationmodels
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
+from tracdb.utils import get_user_trac_username
 
 from .forms import ProfileForm
 from .views import edit_profile
@@ -84,23 +85,19 @@ def test_bio_contains_links_with_protocol_clickable(self):
         )
 
     def test_trac_username_overrides_user_username(self):
-        djangoproject_username = "djangoproject_user"
-        trac_username = "trac_user"
-        user = User.objects.create_user(username=djangoproject_username)
-        Profile.objects.create(user=user, trac_username=trac_username)
-        Revision.objects.create(
-            author=trac_username,
-            rev="91c879eda595c12477bbfa6f51115e88b75ddf88",
-            _time=1731669560,
+        djangoproject_username1 = "djangoproject_user1"
+        djangoproject_username2 = "djangoproject_user2"
+        trac_username1 = "trac_user1"
+        user1 = User.objects.create_user(username=djangoproject_username1)
+        user2 = User.objects.create_user(username=djangoproject_username2)
+        Profile.objects.create(user=user1, trac_username=trac_username1)
+        self.assertEqual(
+            get_user_trac_username(user1),
+            trac_username1,
         )
-
-        user_profile_url = reverse("user_profile", args=[djangoproject_username])
-        user_profile_response = self.client.get(user_profile_url)
-        self.assertContains(
-            user_profile_response,
-            '<a href="https://github.com/django/django/commits/main/'
-            f'?author={trac_username}">Commits: 1.</a>',
-            html=True,
+        self.assertEqual(
+            get_user_trac_username(user2),
+            djangoproject_username2,
         )
 
     def test_stat_commits(self):
@@ -130,6 +127,32 @@ def test_stat_commits(self):
         )
         self.assertNotContains(user2_response, "Commits")
 
+    def test_stat_commits_for_custom_trac_username(self):
+        djangoproject_username = "djangoproject_user"
+        trac_username = "trac_user"
+        user = User.objects.create_user(username=djangoproject_username)
+        Profile.objects.create(user=user, trac_username=trac_username)
+
+        Revision.objects.create(
+            author=trac_username,
+            rev="91c879eda595c12477bbfa6f51115e88b75ddf88",
+            _time=1731669560,
+        )
+        Revision.objects.create(
+            author=trac_username,
+            rev="da2432cccae841f0d7629f17a5d79ec47ed7b7cb",
+            _time=1731669560,
+        )
+
+        user_profile_url = reverse("user_profile", args=[djangoproject_username])
+        user_profile_response = self.client.get(user_profile_url)
+        self.assertContains(
+            user_profile_response,
+            '<a href="https://github.com/django/django/commits/main/'
+            f'?author={trac_username}">Commits: 2.</a>',
+            html=True,
+        )
+
     def test_stat_tickets(self):
         Ticket.objects.create(status="new", reporter="user1")
         Ticket.objects.create(status="new", reporter="user2")
@@ -177,6 +200,47 @@ def test_stat_tickets(self):
             html=True,
         )
 
+    def test_stat_tickets_for_custom_trac_username(self):
+        djangoproject_username = "djangoproject_user"
+        trac_username = "trac_user"
+        user = User.objects.create_user(username=djangoproject_username)
+        Profile.objects.create(user=user, trac_username=trac_username)
+
+        Ticket.objects.create(status="new", reporter=trac_username)
+        Ticket.objects.create(status="new", reporter="user2")
+        Ticket.objects.create(
+            status="closed",
+            reporter=trac_username,
+            owner=trac_username,
+            resolution="fixed",
+        )
+        Ticket.objects.create(
+            status="closed", reporter="user2", owner=trac_username, resolution="fixed"
+        )
+        Ticket.objects.create(
+            status="closed", reporter="user2", owner="user2", resolution="fixed"
+        )
+        Ticket.objects.create(
+            status="closed", reporter="user2", owner=trac_username, resolution="wontfix"
+        )
+
+        user_profile_url = reverse("user_profile", args=[djangoproject_username])
+        user_profile_response = self.client.get(user_profile_url)
+        self.assertContains(
+            user_profile_response,
+            '<a href="https://code.djangoproject.com/query?'
+            f'owner={trac_username}&resolution=fixed&desc=1&order=changetime">'
+            "Tickets fixed: 2.</a>",
+            html=True,
+        )
+        self.assertContains(
+            user_profile_response,
+            '<a href="https://code.djangoproject.com/query?'
+            f'reporter={trac_username}&desc=1&order=changetime">'
+            "Tickets opened: 2.</a>",
+            html=True,
+        )
+
     def test_stat_tickets_triaged(self):
         # Possible values are from trac.ini in code.djangoproject.com.
         initial_ticket_values = {
@@ -212,6 +276,41 @@ def test_stat_tickets_triaged(self):
         response = self.client.get(self.user1_url)
         self.assertContains(response, "New tickets triaged: 3.")
 
+    def test_stat_tickets_triaged_for_custom_trac_username(self):
+        djangoproject_username = "djangoproject_user"
+        trac_username = "trac_user"
+        user = User.objects.create_user(username=djangoproject_username)
+        Profile.objects.create(user=user, trac_username=trac_username)
+
+        # Possible values are from trac.ini in code.djangoproject.com.
+        initial_ticket_values = {
+            "field": "stage",
+            "oldvalue": "Unreviewed",
+            "_time": 1731669560,
+        }
+        TicketChange.objects.create(
+            author=trac_username,
+            newvalue="Accepted",
+            ticket=Ticket.objects.create(),
+            **initial_ticket_values,
+        )
+        TicketChange.objects.create(
+            author=trac_username,
+            newvalue="Someday/Maybe",
+            ticket=Ticket.objects.create(),
+            **initial_ticket_values,
+        )
+        TicketChange.objects.create(
+            author=trac_username,
+            newvalue="Ready for checkin",
+            ticket=Ticket.objects.create(),
+            **initial_ticket_values,
+        )
+
+        user_profile_url = reverse("user_profile", args=[djangoproject_username])
+        user_profile_response = self.client.get(user_profile_url)
+        self.assertContains(user_profile_response, "New tickets triaged: 3.")
+
     def test_stat_tickets_triaged_unaccepted_not_counted(self):
         common_ticket_values = {
             "field": "stage",

From a8984d58983f6d31bd7bd9c00dd555ad7abdfee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 02:07:59 +0300
Subject: [PATCH 40/57] Remove the 'noreply' sender address from the individual
 member account-invite mail's recipients

---
 djangoproject/settings/common.py | 1 -
 members/models.py                | 1 -
 2 files changed, 2 deletions(-)

diff --git a/djangoproject/settings/common.py b/djangoproject/settings/common.py
index 2620284295..83bc3acbac 100644
--- a/djangoproject/settings/common.py
+++ b/djangoproject/settings/common.py
@@ -53,7 +53,6 @@
 
 DEFAULT_FROM_EMAIL = "noreply@djangoproject.com"
 FUNDRAISING_DEFAULT_FROM_EMAIL = "fundraising@djangoproject.com"
-# TODO(ertgl): Update `settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL`.
 INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL = DEFAULT_FROM_EMAIL
 
 FIXTURE_DIRS = [str(PROJECT_PACKAGE.joinpath("fixtures"))]
diff --git a/members/models.py b/members/models.py
index 3dff37f4da..ba93399ac1 100644
--- a/members/models.py
+++ b/members/models.py
@@ -141,7 +141,6 @@ def send_account_invite_mail(self):
                 mail_content,
                 settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
                 [
-                    settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
                     self.email,
                 ],
             )

From 4725cfac74e2e3d98e9e1a1db3110d9855052682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 02:17:24 +0300
Subject: [PATCH 41/57] Format code

---
 members/models.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/members/models.py b/members/models.py
index ba93399ac1..9bd963aa42 100644
--- a/members/models.py
+++ b/members/models.py
@@ -140,9 +140,7 @@ def send_account_invite_mail(self):
                 mail_subject,
                 mail_content,
                 settings.INDIVIDUAL_MEMBER_ACCOUNT_INVITE_DEFAULT_FROM_EMAIL,
-                [
-                    self.email,
-                ],
+                [self.email],
             )
             if sent:
                 self.account_invite_mail_sent_at = timezone_now()

From 5b670323faee0f615a07baed59e4acadb54b29c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 02:25:37 +0300
Subject: [PATCH 42/57] Add tests for management command
 `send_individual_member_account_invite_mails`

---
 members/test_management.py | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/members/test_management.py b/members/test_management.py
index 24c3a64fef..b5a7ee95e6 100644
--- a/members/test_management.py
+++ b/members/test_management.py
@@ -6,7 +6,42 @@
 from django.test import TestCase
 from django.utils.formats import localize
 
-from members.models import SILVER_MEMBERSHIP, CorporateMember
+from members.models import SILVER_MEMBERSHIP, CorporateMember, IndividualMember
+
+
+class IndividualMemberTests(TestCase):
+    def test_send_individual_member_account_invite_mails(self):
+        IndividualMember.objects.create(
+            name="Member 1",
+            email="member1@example.com",
+        )
+        IndividualMember.objects.create(
+            name="Member 2",
+            email="member2@example.com",
+            member_until=date.today() - timedelta(days=7),
+        )
+        call_command(
+            "send_individual_member_account_invite_mails",
+            "--no-logging",
+        )
+        self.assertEqual(len(mail.outbox), 1)
+
+    def test_send_individual_member_account_invite_mails_including_former_members(self):
+        IndividualMember.objects.create(
+            name="Member 1",
+            email="member1@example.com",
+        )
+        IndividualMember.objects.create(
+            name="Member 2",
+            email="member2@example.com",
+            member_until=date.today() - timedelta(days=7),
+        )
+        call_command(
+            "send_individual_member_account_invite_mails",
+            "--include-former-members",
+            "--no-logging",
+        )
+        self.assertEqual(len(mail.outbox), 2)
 
 
 class CorporateMemberTests(TestCase):

From a42b481d7bb46acfccd71442d507b3429c4a321b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 03:22:58 +0300
Subject: [PATCH 43/57] Remove unnecessary test
 `test_trac_username_overrides_user_username`

---
 accounts/tests.py | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index f89be95a0d..3fda35f54b 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -84,22 +84,6 @@ def test_bio_contains_links_with_protocol_clickable(self):
             html=True,
         )
 
-    def test_trac_username_overrides_user_username(self):
-        djangoproject_username1 = "djangoproject_user1"
-        djangoproject_username2 = "djangoproject_user2"
-        trac_username1 = "trac_user1"
-        user1 = User.objects.create_user(username=djangoproject_username1)
-        user2 = User.objects.create_user(username=djangoproject_username2)
-        Profile.objects.create(user=user1, trac_username=trac_username1)
-        self.assertEqual(
-            get_user_trac_username(user1),
-            trac_username1,
-        )
-        self.assertEqual(
-            get_user_trac_username(user2),
-            djangoproject_username2,
-        )
-
     def test_stat_commits(self):
         Revision.objects.create(
             author="user1",

From 58ed3bc37c90a21b5d0d2fd8580722824be65f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 03:51:06 +0300
Subject: [PATCH 44/57] Fix test
 `BoundFieldWithCharacterCounterTests.test_characters_remaining_matches_client_side_js_implementation`

---
 contrib/django/forms/tests.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/contrib/django/forms/tests.py b/contrib/django/forms/tests.py
index ec3c574ece..a6395af40b 100644
--- a/contrib/django/forms/tests.py
+++ b/contrib/django/forms/tests.py
@@ -65,8 +65,9 @@ def test_characters_remaining_is_negative_when_content_exceeds_max_length(self):
 
     def test_characters_remaining_matches_client_side_js_implementation(self):
         ending = "\r\n\r\r\n"
-        max_length = randint(0, 20)
-        visual_content_length = max_length - len(ending)
+        ending_length = len(ending)
+        max_length = randint(ending_length, ending_length + 10)
+        visual_content_length = max_length - ending_length
         visual_content = "*" * visual_content_length
         content = visual_content + ending
         normalized_ending = ending.replace("\r\n", "\n").replace("\r", "\n")
@@ -76,5 +77,5 @@ def test_characters_remaining_matches_client_side_js_implementation(self):
             content=content,
         )
         remaining_count = bound_field.get_characters_remaining_count()
-        self.assertGreater(remaining_count, 0)
+        self.assertGreaterEqual(remaining_count, 0)
         self.assertEqual(remaining_count, max_length - len(normalized_content))

From 29c77edf4d183afa8b446a2da2f29d48fc703acb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 03:58:16 +0300
Subject: [PATCH 45/57] Prevent rendering Trac stats for a user when the
 username is used by another user in a verified way

---
 accounts/tests.py | 108 ++++++++++++++++++++++++++++++++++++++++++++++
 accounts/views.py |  42 ++++++++++--------
 tracdb/utils.py   |  28 ++++++++++++
 3 files changed, 160 insertions(+), 18 deletions(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index 3fda35f54b..d8531c3d39 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -84,6 +84,15 @@ def test_bio_contains_links_with_protocol_clickable(self):
             html=True,
         )
 
+    def test_same_trac_username_can_be_used_for_multiple_users(self):
+        # For the rare/temporal cases of when multiple accounts belong to
+        # the same user.
+        #
+        # Please also see the comment in the function:
+        # `tracdb.utils.check_if_public_trac_stats_are_renderable_for_user`
+
+        self.assertFalse(Profile._meta.get_field("trac_username").unique)
+
     def test_stat_commits(self):
         Revision.objects.create(
             author="user1",
@@ -137,6 +146,31 @@ def test_stat_commits_for_custom_trac_username(self):
             html=True,
         )
 
+    def test_stat_commits_for_custom_trac_username_used_by_another_user(self):
+        djangoproject_username1 = "djangoproject_user1"
+        trac_username1 = "trac_user1"
+        user1 = User.objects.create_user(username=djangoproject_username1)
+        Profile.objects.create(user=user1, trac_username=trac_username1)
+
+        djangoproject_username2 = trac_username1
+        user2 = User.objects.create_user(username=djangoproject_username2)
+        Profile.objects.create(user=user2)
+
+        Revision.objects.create(
+            author=trac_username1,
+            rev="91c879eda595c12477bbfa6f51115e88b75ddf88",
+            _time=1731669560,
+        )
+        Revision.objects.create(
+            author=trac_username1,
+            rev="da2432cccae841f0d7629f17a5d79ec47ed7b7cb",
+            _time=1731669560,
+        )
+
+        user_profile_url2 = reverse("user_profile", args=[djangoproject_username2])
+        user_profile_response2 = self.client.get(user_profile_url2)
+        self.assertNotContains(user_profile_response2, "Commits")
+
     def test_stat_tickets(self):
         Ticket.objects.create(status="new", reporter="user1")
         Ticket.objects.create(status="new", reporter="user2")
@@ -225,6 +259,41 @@ def test_stat_tickets_for_custom_trac_username(self):
             html=True,
         )
 
+    def test_stat_tickets_for_custom_trac_username_used_by_another_user(self):
+        djangoproject_username1 = "djangoproject_user1"
+        trac_username1 = "trac_user1"
+        user1 = User.objects.create_user(username=djangoproject_username1)
+        Profile.objects.create(user=user1, trac_username=trac_username1)
+
+        djangoproject_username2 = trac_username1
+        user2 = User.objects.create_user(username=djangoproject_username2)
+        Profile.objects.create(user=user2)
+
+        Ticket.objects.create(status="new", reporter=trac_username1)
+        Ticket.objects.create(status="new", reporter="user2")
+        Ticket.objects.create(
+            status="closed",
+            reporter=trac_username1,
+            owner=trac_username1,
+            resolution="fixed",
+        )
+        Ticket.objects.create(
+            status="closed", reporter="user2", owner=trac_username1, resolution="fixed"
+        )
+        Ticket.objects.create(
+            status="closed", reporter="user2", owner="user2", resolution="fixed"
+        )
+        Ticket.objects.create(
+            status="closed",
+            reporter="user2",
+            owner=trac_username1,
+            resolution="wontfix",
+        )
+
+        user_profile_url2 = reverse("user_profile", args=[djangoproject_username2])
+        user_profile_response2 = self.client.get(user_profile_url2)
+        self.assertNotContains(user_profile_response2, "Tickets fixed:")
+
     def test_stat_tickets_triaged(self):
         # Possible values are from trac.ini in code.djangoproject.com.
         initial_ticket_values = {
@@ -295,6 +364,45 @@ def test_stat_tickets_triaged_for_custom_trac_username(self):
         user_profile_response = self.client.get(user_profile_url)
         self.assertContains(user_profile_response, "New tickets triaged: 3.")
 
+    def test_stat_tickets_triaged_for_custom_trac_username_used_by_another_user(self):
+        djangoproject_username1 = "djangoproject_user1"
+        trac_username1 = "trac_user1"
+        user1 = User.objects.create_user(username=djangoproject_username1)
+        Profile.objects.create(user=user1, trac_username=trac_username1)
+
+        djangoproject_username2 = trac_username1
+        user2 = User.objects.create_user(username=djangoproject_username2)
+        Profile.objects.create(user=user2)
+
+        # Possible values are from trac.ini in code.djangoproject.com.
+        initial_ticket_values = {
+            "field": "stage",
+            "oldvalue": "Unreviewed",
+            "_time": 1731669560,
+        }
+        TicketChange.objects.create(
+            author=trac_username1,
+            newvalue="Accepted",
+            ticket=Ticket.objects.create(),
+            **initial_ticket_values,
+        )
+        TicketChange.objects.create(
+            author=trac_username1,
+            newvalue="Someday/Maybe",
+            ticket=Ticket.objects.create(),
+            **initial_ticket_values,
+        )
+        TicketChange.objects.create(
+            author=trac_username1,
+            newvalue="Ready for checkin",
+            ticket=Ticket.objects.create(),
+            **initial_ticket_values,
+        )
+
+        user_profile_url2 = reverse("user_profile", args=[djangoproject_username2])
+        user_profile_response2 = self.client.get(user_profile_url2)
+        self.assertNotContains(user_profile_response2, "New tickets triaged:")
+
     def test_stat_tickets_triaged_unaccepted_not_counted(self):
         common_ticket_values = {
             "field": "stage",
diff --git a/accounts/views.py b/accounts/views.py
index 0fcfc9d1e9..2cb3e2cd42 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -8,21 +8,43 @@
 from django.shortcuts import get_object_or_404, redirect, render
 
 from tracdb import stats as trac_stats
-from tracdb.utils import get_user_trac_username
+from tracdb.utils import (
+    check_if_public_trac_stats_are_renderable_for_user,
+    get_user_trac_username,
+)
 
 from .forms import DeleteProfileForm, ProfileForm
 from .models import Profile
 
 
+def get_public_user_trac_stats(user):
+    trac_username = get_user_trac_username(user)
+    encoded_trac_username = trac_username.encode("ascii", "ignore")
+    key = "trac_user_vital_status:%s" % hashlib.md5(encoded_trac_username).hexdigest()
+    info = cache.get(key)
+    if info is None:
+        info = {}
+        if check_if_public_trac_stats_are_renderable_for_user(user):
+            info = trac_stats.get_user_stats(trac_username)
+        # Hide any stat with a value = 0 so that we don't accidentally insult
+        # non-contributors.
+        for k, v in list(info.items()):
+            if v.count == 0:
+                info.pop(k)
+        cache.set(key, info, 60 * 60)
+    return info
+
+
 def user_profile(request, username):
     user = get_object_or_404(User, username=username)
+    stats = get_public_user_trac_stats(user)
     return render(
         request,
         "accounts/user_profile.html",
         {
             "user_obj": user,
             "email_hash": hashlib.md5(user.email.encode("ascii", "ignore")).hexdigest(),
-            "stats": get_user_stats(user),
+            "stats": stats,
         },
     )
 
@@ -70,19 +92,3 @@ def delete_profile(request):
 
 def delete_profile_success(request):
     return render(request, "accounts/delete_profile_success.html")
-
-
-def get_user_stats(user):
-    trac_username = get_user_trac_username(user)
-    encoded_trac_username = trac_username.encode("ascii", "ignore")
-    key = "trac_user_vital_status:%s" % hashlib.md5(encoded_trac_username).hexdigest()
-    info = cache.get(key)
-    if info is None:
-        info = trac_stats.get_user_stats(trac_username)
-        # Hide any stat with a value = 0 so that we don't accidentally insult
-        # non-contributors.
-        for k, v in list(info.items()):
-            if v.count == 0:
-                info.pop(k)
-        cache.set(key, info, 60 * 60)
-    return info
diff --git a/tracdb/utils.py b/tracdb/utils.py
index 5e618e4b67..165ab93c78 100644
--- a/tracdb/utils.py
+++ b/tracdb/utils.py
@@ -2,6 +2,8 @@
 
 from django.contrib.auth import get_user_model
 
+from accounts.models import Profile
+
 User = get_user_model()
 
 
@@ -10,3 +12,29 @@ def get_user_trac_username(user):
         if user.profile.trac_username:
             return user.profile.trac_username
     return user.username
+
+
+def check_if_trac_username_is_overridden_for_user(user):
+    with suppress(User.profile.RelatedObjectDoesNotExist):
+        if user.profile.trac_username:
+            return True
+    return False
+
+
+def check_if_trac_username_is_overridden_for_another_user(user):
+    return (
+        Profile.objects.exclude(user_id=user.pk)
+        .filter(trac_username=user.username)
+        .exists()
+    )
+
+
+def check_if_public_trac_stats_are_renderable_for_user(user):
+    # When `Profile.trac_username` is set for a user, this means that it's
+    # verified that they own that Trac username. But this also means that
+    # no more djangoproject.com user should use that username to retrieve the
+    # public stats, unless the accounts belong to the same user (if this is the
+    # case, please set the same `trac_username` for both users).
+    return check_if_trac_username_is_overridden_for_user(
+        user
+    ) or not check_if_trac_username_is_overridden_for_another_user(user)

From e13bd185fd98af899609b1b5a739106571b9437f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 04:03:15 +0300
Subject: [PATCH 46/57] Fix Flake8 F401 (imported but unused) error

---
 accounts/tests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/accounts/tests.py b/accounts/tests.py
index d8531c3d39..6c6e419a3c 100644
--- a/accounts/tests.py
+++ b/accounts/tests.py
@@ -11,7 +11,6 @@
 from foundation import models as foundationmodels
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
-from tracdb.utils import get_user_trac_username
 
 from .forms import ProfileForm
 from .views import edit_profile

From f31400709268419f89206537282ba26ab178f96f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 05:15:27 +0300
Subject: [PATCH 47/57] Rename
 `check_if_trac_username_is_overridden_for_another_user` to
 `check_if_user_username_is_used_as_trac_username_by_another_user`

---
 tracdb/utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tracdb/utils.py b/tracdb/utils.py
index 165ab93c78..caf26c7475 100644
--- a/tracdb/utils.py
+++ b/tracdb/utils.py
@@ -21,7 +21,7 @@ def check_if_trac_username_is_overridden_for_user(user):
     return False
 
 
-def check_if_trac_username_is_overridden_for_another_user(user):
+def check_if_user_username_is_used_as_trac_username_by_another_user(user):
     return (
         Profile.objects.exclude(user_id=user.pk)
         .filter(trac_username=user.username)
@@ -37,4 +37,4 @@ def check_if_public_trac_stats_are_renderable_for_user(user):
     # case, please set the same `trac_username` for both users).
     return check_if_trac_username_is_overridden_for_user(
         user
-    ) or not check_if_trac_username_is_overridden_for_another_user(user)
+    ) or not check_if_user_username_is_used_as_trac_username_by_another_user(user)

From 86d44c443bd7e5d706acc3341bba36a44db5eb0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 24 Oct 2025 05:37:55 +0300
Subject: [PATCH 48/57] Move code block inside `if` to prevent unnecessary
 execution

---
 accounts/views.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/accounts/views.py b/accounts/views.py
index 2cb3e2cd42..d839ef11d3 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -26,12 +26,12 @@ def get_public_user_trac_stats(user):
         info = {}
         if check_if_public_trac_stats_are_renderable_for_user(user):
             info = trac_stats.get_user_stats(trac_username)
-        # Hide any stat with a value = 0 so that we don't accidentally insult
-        # non-contributors.
-        for k, v in list(info.items()):
-            if v.count == 0:
-                info.pop(k)
-        cache.set(key, info, 60 * 60)
+            # Hide any stat with a value = 0 so that we don't accidentally insult
+            # non-contributors.
+            for k, v in list(info.items()):
+                if v.count == 0:
+                    info.pop(k)
+            cache.set(key, info, 60 * 60)
     return info
 
 

From c3ae8531819c420329b9d30d7cb479b460464b70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 15:31:13 +0300
Subject: [PATCH 49/57] Add tests for `ProfileAdminForm`

---
 accounts/test_admin.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 accounts/test_admin.py

diff --git a/accounts/test_admin.py b/accounts/test_admin.py
new file mode 100644
index 0000000000..e761c7ef07
--- /dev/null
+++ b/accounts/test_admin.py
@@ -0,0 +1,18 @@
+from django.test import TestCase
+from django.utils.functional import Promise
+
+from .admin import ProfileAdminForm
+
+
+class ProfileAdminFormTests(TestCase):
+    def test_bio_field_has_max_length(self):
+        form = ProfileAdminForm()
+        self.assertIn("bio", form.fields)
+        self.assertIn("maxlength", form.fields["bio"].widget.attrs)
+        self.assertIsInstance(form.fields["bio"].widget.attrs["maxlength"], int)
+
+    def test_bio_field_has_help_text(self):
+        form = ProfileAdminForm()
+        self.assertIn("bio", form.fields)
+        self.assertIsInstance(form.fields["bio"].help_text, (str, Promise))
+        self.assertGreater(len(form.fields["bio"].help_text), 0)

From 38f3ca3054530bfa7f39f5b27ea3b066e70b0bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 15:35:17 +0300
Subject: [PATCH 50/57] Prevent unnecessary decrease of test coverage rate in
 the `IndividualMember` model

---
 members/models.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/members/models.py b/members/models.py
index 9bd963aa42..44721e9c8e 100644
--- a/members/models.py
+++ b/members/models.py
@@ -88,11 +88,9 @@ class Meta:
         ]
 
     @classmethod
-    def match_and_set_users_by_email(cls, queryset=None):
+    def match_and_set_users_by_email(cls):
         updated_count = 0
-        if queryset is None:
-            queryset = cls.objects.all()
-        queryset = queryset.filter(user_id__isnull=True)
+        queryset = cls.objects.filter(user_id__isnull=True)
         # Wait for other active transactions to prevent race conditions.
         queryset = queryset.select_for_update(nowait=False)
         users_queryset = User.objects.filter(
@@ -146,7 +144,7 @@ def send_account_invite_mail(self):
                 self.account_invite_mail_sent_at = timezone_now()
                 self.save()
                 return IndividualMemberAccountInviteSendMailStatus.SENT
-        return IndividualMemberAccountInviteSendMailStatus.FAILED
+        return IndividualMemberAccountInviteSendMailStatus.FAILED  # pragma: no cover
 
 
 class Team(models.Model):

From ea1ee73971436bc477fb926b9ef82dba39648623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 15:45:23 +0300
Subject: [PATCH 51/57] Add tests for the management command
 `send_individual_member_account_invite_mails`

---
 ..._individual_member_account_invite_mails.py |  2 +-
 members/test_management.py                    | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/members/management/commands/send_individual_member_account_invite_mails.py b/members/management/commands/send_individual_member_account_invite_mails.py
index a640df1cd9..81dd7a8597 100644
--- a/members/management/commands/send_individual_member_account_invite_mails.py
+++ b/members/management/commands/send_individual_member_account_invite_mails.py
@@ -40,6 +40,6 @@ def write_account_invite_send_mail_results(self, results):
             if (
                 status_enum_value == IndividualMemberAccountInviteSendMailStatus.FAILED
                 and count > 0
-            ):
+            ):  # pragma: no cover
                 writer = self.stderr
             writer.write(f"{status_enum_member}: {count}")
diff --git a/members/test_management.py b/members/test_management.py
index b5a7ee95e6..60c5f8237c 100644
--- a/members/test_management.py
+++ b/members/test_management.py
@@ -1,4 +1,5 @@
 from datetime import date, timedelta
+from io import StringIO
 
 from django.conf import settings
 from django.core import mail
@@ -6,7 +7,12 @@
 from django.test import TestCase
 from django.utils.formats import localize
 
-from members.models import SILVER_MEMBERSHIP, CorporateMember, IndividualMember
+from members.models import (
+    SILVER_MEMBERSHIP,
+    CorporateMember,
+    IndividualMember,
+    IndividualMemberAccountInviteSendMailStatus,
+)
 
 
 class IndividualMemberTests(TestCase):
@@ -20,11 +26,23 @@ def test_send_individual_member_account_invite_mails(self):
             email="member2@example.com",
             member_until=date.today() - timedelta(days=7),
         )
+        stdout = StringIO()
+        stderr = StringIO()
         call_command(
             "send_individual_member_account_invite_mails",
-            "--no-logging",
+            stdout=stdout,
+            stderr=stderr,
         )
         self.assertEqual(len(mail.outbox), 1)
+        stdout_output = stdout.getvalue()
+        stderr_output = stderr.getvalue()
+        self.assertGreater(len(stdout_output), 0)
+        self.assertEqual(len(stderr_output), 0)
+        stdout_output_lines = stdout_output.splitlines()
+        self.assertIn(
+            f"{IndividualMemberAccountInviteSendMailStatus.SENT}: 1",
+            stdout_output_lines,
+        )
 
     def test_send_individual_member_account_invite_mails_including_former_members(self):
         IndividualMember.objects.create(

From 6b0d2c34ed69c7b403f6a2d5f9f7510cd0b9d080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 17:15:49 +0300
Subject: [PATCH 52/57] Add tests for `IndividualMemberAdmin`

---
 members/admin.py      |  2 +-
 members/test_admin.py | 62 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/members/admin.py b/members/admin.py
index 7790d51f35..c2bccdcda9 100644
--- a/members/admin.py
+++ b/members/admin.py
@@ -62,7 +62,7 @@ def send_account_invite_mail(self, request, queryset):
                 % {"count": sent_count},
                 messages.SUCCESS,
             )
-        if failed_count > 0:
+        if failed_count > 0:  # pragma: no cover
             self.message_user(
                 request,
                 ngettext(
diff --git a/members/test_admin.py b/members/test_admin.py
index 29fffd49cb..17d7844388 100644
--- a/members/test_admin.py
+++ b/members/test_admin.py
@@ -1,10 +1,70 @@
 from datetime import date, timedelta
 
 from django.contrib import admin
+from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
+from django.contrib.auth import get_user_model
+from django.contrib.messages import INFO, SUCCESS
+from django.core import mail
 from django.test import TestCase
+from django.urls import reverse
 
 from .admin import CorporateMemberAdmin, StatusFilter
-from .models import CorporateMember
+from .models import CorporateMember, IndividualMember
+
+User = get_user_model()
+
+
+class IndividualMemberAdminTests(TestCase):
+    def test_send_account_invite_mail_action(self):
+        superuser = User.objects.create_superuser("superuser")
+        self.client.force_login(superuser)
+
+        individual_member1 = IndividualMember.objects.create(
+            name="Individual Member 1",
+            email="individualmember1@example.com",
+        )
+        individual_member2 = IndividualMember.objects.create(
+            name="Individual Member 2",
+            email="individualmember2@example.com",
+        )
+
+        changelist_url = reverse("admin:members_individualmember_changelist")
+        selected_pks = [
+            str(individual_member1.pk),
+            str(individual_member2.pk),
+        ]
+
+        self.assertEqual(len(mail.outbox), 0)
+        response2 = self.client.post(
+            changelist_url,
+            data={
+                "action": "send_account_invite_mail",
+                ACTION_CHECKBOX_NAME: selected_pks,
+            },
+            follow=True,
+        )
+        self.assertEqual(response2.status_code, 200)
+        self.assertEqual(len(mail.outbox), 2)
+        messages = response2.context.get("messages", [])
+        self.assertEqual(len(messages), 1)
+        # messages storage is not a subscriptable, but it's an iterable.
+        self.assertEqual(next(iter(messages)).level, SUCCESS)
+        mail.outbox.clear()
+
+        response3 = self.client.post(
+            changelist_url,
+            data={
+                "action": "send_account_invite_mail",
+                ACTION_CHECKBOX_NAME: selected_pks,
+            },
+            follow=True,
+        )
+        self.assertEqual(response3.status_code, 200)
+        self.assertEqual(len(mail.outbox), 0)
+        messages = response3.context.get("messages", [])
+        self.assertEqual(len(messages), 1)
+        # messages storage is not a subscriptable, but it's an iterable.
+        self.assertEqual(next(iter(messages)).level, INFO)
 
 
 class CorporateMemberAdminTests(TestCase):

From dd4e5d8f07a4a88251be14b2f61765c66c6d6b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 17:33:18 +0300
Subject: [PATCH 53/57] Add temporary tests for the migration `members.0012`

---
 members/migrations/0012_auto_20251021_2353.py |  2 +-
 members/test_migrations.py                    | 70 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 members/test_migrations.py

diff --git a/members/migrations/0012_auto_20251021_2353.py b/members/migrations/0012_auto_20251021_2353.py
index 781d242a1d..d21d711210 100644
--- a/members/migrations/0012_auto_20251021_2353.py
+++ b/members/migrations/0012_auto_20251021_2353.py
@@ -25,7 +25,7 @@ def link_individual_members_to_users_by_email(apps, schema_editor):
             IndividualMember.objects.filter(email=user.email).update(user=user)
 
 
-def noop(apps, schema_editor):
+def noop(apps, schema_editor):  # pragma: no cover
     pass
 
 
diff --git a/members/test_migrations.py b/members/test_migrations.py
new file mode 100644
index 0000000000..3dff1d434b
--- /dev/null
+++ b/members/test_migrations.py
@@ -0,0 +1,70 @@
+from io import StringIO
+from random import randint
+
+from django.contrib.auth import get_user_model
+from django.core.management import call_command
+from django.test import TestCase
+
+from .models import IndividualMember
+
+User = get_user_model()
+
+
+class IndividualMemberTests(TestCase):
+    def test_migration_members_0012_link_individual_members_to_users_by_email(self):
+        stdout = StringIO()
+        stderr = StringIO()
+
+        call_command(
+            "migrate",
+            "members",
+            "0011",
+            no_input=True,
+            stdout=stdout,
+            stderr=stderr,
+        )
+
+        members_count = randint(2, 4)
+        user_pk_to_email_mapping = {}
+        for i in range(members_count):
+            username = f"user{i}"
+            email = f"{username}@example.com"
+            user = User.objects.create_user(
+                username=username,
+                email=email,
+                password="password",
+            )
+            user_pk_to_email_mapping[user.pk] = email
+            IndividualMember.objects.create(
+                name=f"User {i}",
+                email=email,
+            )
+        self.assertEqual(
+            IndividualMember.objects.filter(
+                user_id__isnull=True,
+                email__in=user_pk_to_email_mapping.values(),
+            ).count(),
+            members_count,
+        )
+
+        call_command(
+            "migrate",
+            "members",
+            "0012",
+            no_input=True,
+            stdout=stdout,
+            stderr=stderr,
+        )
+
+        individual_member_queryset = IndividualMember.objects.filter(
+            user_id__in=user_pk_to_email_mapping.keys(),
+        )
+        self.assertEqual(
+            individual_member_queryset.count(),
+            members_count,
+        )
+        for individual_member in individual_member_queryset.iterator():
+            self.assertEqual(
+                individual_member.email,
+                user_pk_to_email_mapping[individual_member.user_id],
+            )

From 511c9224b462d570ebc85447cca166fd3a04d324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 18:20:47 +0300
Subject: [PATCH 54/57] Add tests for the management command
 `link_individual_members_to_users_by_email`

---
 members/test_management.py | 63 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/members/test_management.py b/members/test_management.py
index 60c5f8237c..c54be6314f 100644
--- a/members/test_management.py
+++ b/members/test_management.py
@@ -2,6 +2,7 @@
 from io import StringIO
 
 from django.conf import settings
+from django.contrib.auth import get_user_model
 from django.core import mail
 from django.core.management import call_command
 from django.test import TestCase
@@ -14,8 +15,70 @@
     IndividualMemberAccountInviteSendMailStatus,
 )
 
+User = get_user_model()
+
 
 class IndividualMemberTests(TestCase):
+    def test_link_individual_members_to_users_by_email(self):
+        members_count = 4
+        user_pk_to_email_mapping = {}
+        for i in range(members_count):
+            username = f"user{i}"
+            email = f"{username}@example.com"
+            user = User.objects.create_user(
+                username=username,
+                email=email,
+                password="password",
+            )
+            user_pk_to_email_mapping[user.pk] = email
+            IndividualMember.objects.create(
+                name=f"User {i}",
+                email=email,
+            )
+        self.assertEqual(
+            IndividualMember.objects.filter(
+                user_id__isnull=True,
+                email__in=user_pk_to_email_mapping.values(),
+            ).count(),
+            members_count,
+        )
+        stdout = StringIO()
+        stderr = StringIO()
+        call_command(
+            "link_individual_members_to_users_by_email",
+            stdout=stdout,
+            stderr=stderr,
+        )
+        individual_member_queryset = IndividualMember.objects.filter(
+            user_id__in=user_pk_to_email_mapping.keys(),
+        )
+        self.assertEqual(
+            individual_member_queryset.count(),
+            members_count,
+        )
+        for individual_member in individual_member_queryset.iterator():
+            self.assertEqual(
+                individual_member.email,
+                user_pk_to_email_mapping[individual_member.user_id],
+            )
+        stdout_output_lines = stdout.getvalue().splitlines()
+        self.assertIn(
+            f"Updated: {members_count}",
+            stdout_output_lines,
+        )
+
+    def test_link_individual_members_to_users_by_email_with_option_no_logging(self):
+        stdout = StringIO()
+        stderr = StringIO()
+        call_command(
+            "link_individual_members_to_users_by_email",
+            no_logging=True,
+            stdout=stdout,
+            stderr=stderr,
+        )
+        self.assertEqual(len(stdout.getvalue()), 0)
+        self.assertEqual(len(stderr.getvalue()), 0)
+
     def test_send_individual_member_account_invite_mails(self):
         IndividualMember.objects.create(
             name="Member 1",

From 32a44edc55c5c7d973c7768517cf46d03d3d2b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 18:25:19 +0300
Subject: [PATCH 55/57] Improve tests for the management command
 `send_individual_member_account_invite_mails`

---
 members/test_management.py | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/members/test_management.py b/members/test_management.py
index c54be6314f..b2c1dcf76a 100644
--- a/members/test_management.py
+++ b/members/test_management.py
@@ -117,12 +117,36 @@ def test_send_individual_member_account_invite_mails_including_former_members(se
             email="member2@example.com",
             member_until=date.today() - timedelta(days=7),
         )
+        stdout = StringIO()
+        stderr = StringIO()
         call_command(
             "send_individual_member_account_invite_mails",
             "--include-former-members",
-            "--no-logging",
+            stdout=stdout,
+            stderr=stderr,
         )
         self.assertEqual(len(mail.outbox), 2)
+        stdout_output = stdout.getvalue()
+        stderr_output = stderr.getvalue()
+        self.assertGreater(len(stdout_output), 0)
+        self.assertEqual(len(stderr_output), 0)
+        stdout_output_lines = stdout_output.splitlines()
+        self.assertIn(
+            f"{IndividualMemberAccountInviteSendMailStatus.SENT}: 2",
+            stdout_output_lines,
+        )
+
+    def test_send_individual_member_account_invite_mails_with_option_no_logging(self):
+        stdout = StringIO()
+        stderr = StringIO()
+        call_command(
+            "send_individual_member_account_invite_mails",
+            no_logging=True,
+            stdout=stdout,
+            stderr=stderr,
+        )
+        self.assertEqual(len(stdout.getvalue()), 0)
+        self.assertEqual(len(stderr.getvalue()), 0)
 
 
 class CorporateMemberTests(TestCase):

From e77cf239f8bd12db66b897ed6f6fda3f80da9b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 18:28:03 +0300
Subject: [PATCH 56/57] Use fixed db records number instead of randint in some
 tests

---
 members/test_migrations.py | 3 +--
 members/test_models.py     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/members/test_migrations.py b/members/test_migrations.py
index 3dff1d434b..95b94f06b5 100644
--- a/members/test_migrations.py
+++ b/members/test_migrations.py
@@ -1,5 +1,4 @@
 from io import StringIO
-from random import randint
 
 from django.contrib.auth import get_user_model
 from django.core.management import call_command
@@ -24,7 +23,7 @@ def test_migration_members_0012_link_individual_members_to_users_by_email(self):
             stderr=stderr,
         )
 
-        members_count = randint(2, 4)
+        members_count = 4
         user_pk_to_email_mapping = {}
         for i in range(members_count):
             username = f"user{i}"
diff --git a/members/test_models.py b/members/test_models.py
index bd3d671cba..3755bff1ec 100644
--- a/members/test_models.py
+++ b/members/test_models.py
@@ -45,7 +45,7 @@ def test_is_active(self):
         self.assertFalse(self.member.is_active)
 
     def test_match_and_set_users_by_email(self):
-        members_count = randint(2, 8)
+        members_count = 4
         user_pk_to_email_mapping = {}
         for i in range(members_count):
             username = f"user{i}"
@@ -82,7 +82,7 @@ def test_match_and_set_users_by_email(self):
             )
 
     def test_send_account_invite_mails(self):
-        individual_members_count = randint(1, 5)
+        individual_members_count = 2
         individual_member_pks = set()
         for i in range(individual_members_count):
             username = f"user{i}"

From c50371e97241103367aa27a419e122307bda0d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ertu=C4=9Frul=20Keremo=C4=9Flu?= <ertugkeremoglu@gmail.com>
Date: Fri, 7 Nov 2025 18:34:05 +0300
Subject: [PATCH 57/57] Add note that the migration test can be removed after
 deployment

---
 members/test_migrations.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/members/test_migrations.py b/members/test_migrations.py
index 95b94f06b5..e269b38760 100644
--- a/members/test_migrations.py
+++ b/members/test_migrations.py
@@ -11,6 +11,11 @@
 
 class IndividualMemberTests(TestCase):
     def test_migration_members_0012_link_individual_members_to_users_by_email(self):
+        # Once the related changes are deployed and the database has been
+        # migrated, we might consider removing this test. If you do remove it,
+        # please remember to mark the corresponding migration code so that it's
+        # excluded from the coverage rates (pragma: no cover).
+
         stdout = StringIO()
         stderr = StringIO()