Updates minutes links

accounts/forms.py

@@ -64,13 +64,6 @@ def clean(self):
             raise forms.ValidationError(_("Staff users cannot be deleted"))
         return cleaned_data
 
-    def add_errors_from_protectederror(self, exception):
-        """
-        Convert the given ProtectedError exception object into validation
-        errors on the instance.
-        """
-        self.add_error(None, _("User has protected data and cannot be deleted"))
-
     @transaction.atomic()
     def delete(self):
         """

accounts/tests.py

@@ -6,7 +6,6 @@
 from django_hosts.resolvers import reverse
 
 from accounts.forms import DeleteProfileForm
-from foundation import models as foundationmodels
 from tracdb.models import Revision, Ticket, TicketChange
 from tracdb.testutils import TracDBCreateDatabaseMixin
 
@@ -218,17 +217,6 @@ def test_deletion_staff_forbidden(self):
         form = self.create_user_and_form(is_staff=True)
         self.assertFormError(form, None, ["Staff users cannot be deleted"])
 
-    def test_user_with_protected_data(self):
-        form = self.create_user_and_form()
-        form.user.boardmember_set.create(
-            office=foundationmodels.Office.objects.create(name="test"),
-            term=foundationmodels.Term.objects.create(year=2000),
-        )
-        form.delete()
-        self.assertFormError(
-            form, None, ["User has protected data and cannot be deleted"]
-        )
-
     def test_form_delete_method_requires_valid_form(self):
         form = self.create_user_and_form(is_staff=True)
         self.assertRaises(form.InvalidFormError, form.delete)

djangoproject/templates/base_foundation.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load fundraising_extras meetings i18n %}
+{% load fundraising_extras i18n %}
 
 {% block og_title %}Django Software Foundation{% endblock %}
 
@@ -26,7 +26,10 @@ <h3>About the foundation</h3>
       <li><a href="/foundation/conferences/">Organizing a Django conference</a></li>
     </ul>
     <h3>{% translate "Latest DSF meeting minutes" %}</h3>
-    {% render_latest_meeting_minute_entries 2 %}
-    <a href="{% url 'foundation_meeting_archive_index' %}" class="link-readmore">{% translate "More meeting minutes" %}</a>
+    <p>
+      {% blocktrans with minutes_url="https://github.com/django/dsf-minutes" %}
+        The latest meeting minutes can be found on <a href="{{ minutes_url }}">the minutes repository</a>.
+      {% endblocktrans %}
+    </p>
   </div>
 {% endblock %}

djangoproject/urls/www.py

@@ -13,8 +13,7 @@
 from aggregator.feeds import CommunityAggregatorFeed, CommunityAggregatorFirehoseFeed
 from blog.feeds import WeblogEntryFeed
 from blog.sitemaps import WeblogSitemap
-from foundation.feeds import FoundationMinutesFeed
-from foundation.views import CoreDevelopers
+from foundation.views import CoreDevelopers, minutes_redirect
 
 admin.autodiscover()
 
@@ -96,7 +95,11 @@
     ),
     path("contact/", include("contact.urls")),
     path("foundation/django_core/", CoreDevelopers.as_view()),
-    path("foundation/minutes/", include("foundation.urls.meetings")),
+    path(
+        "foundation/minutes/<int:year>/<str:month>/<int:day>/<str:slug>/",
+        minutes_redirect,
+        name="minutes_redirect",
+    ),
     path("foundation/", include("members.urls")),
     path("fundraising/", include("fundraising.urls")),
     # Used by docs search suggestions
@@ -116,11 +119,6 @@
         name="aggregator-firehose-feed",
     ),
     path("rss/community/<slug>/", CommunityAggregatorFeed(), name="aggregator-feed"),
-    path(
-        "rss/foundation/minutes/",
-        FoundationMinutesFeed(),
-        name="foundation-minutes-feed",
-    ),
     # django-push
     path("subscriber/", include("django_push.subscriber.urls")),
     # Trac schtuff