launchpad-reviewers team mailing list archive

[İlker Emre Koç <mp+477118@xxxxxxxxxxxxxxxxxx>]

İlker Emre Koç has proposed merging ~ilkeremrekoc/launchpad:remove-mentions-of-twitter into launchpad:master.

Commit message:
Remove mentions of Twitter from offline error pages

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ilkeremrekoc/launchpad/+git/launchpad/+merge/477118

Removed mentions of Twitter and the now defunct LaunchpadStatus Twitter account handle from offline error pages and messages.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ilkeremrekoc/launchpad:remove-mentions-of-twitter into launchpad:master.

diff --git a/charm/launchpad-frontend-extras/files/generic/offline-maintenance-haproxy.html b/charm/launchpad-frontend-extras/files/generic/offline-maintenance-haproxy.html
index 30707bc..772cd05 100644
--- a/charm/launchpad-frontend-extras/files/generic/offline-maintenance-haproxy.html
+++ b/charm/launchpad-frontend-extras/files/generic/offline-maintenance-haproxy.html
@@ -30,8 +30,6 @@ Content-Type: text/html
             <h2>Launchpad is offline for scheduled maintenance.</h2>
             <p>
               We'll be back soon. Check
-              <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter or
               <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus@ubuntu.social</a>
               on Mastodon for updates.
             </p>
diff --git a/charm/launchpad-frontend-extras/files/generic/offline-maintenance.html b/charm/launchpad-frontend-extras/files/generic/offline-maintenance.html
index 7f46f5c..c5db4a0 100644
--- a/charm/launchpad-frontend-extras/files/generic/offline-maintenance.html
+++ b/charm/launchpad-frontend-extras/files/generic/offline-maintenance.html
@@ -23,8 +23,6 @@
             <h2>Launchpad is offline for scheduled maintenance.</h2>
             <p>
               We'll be back soon. Check
-              <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter or
               <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus@ubuntu.social</a>
               on Mastodon for updates.
             </p>
diff --git a/charm/launchpad-frontend-extras/files/generic/offline-unplanned-haproxy.html b/charm/launchpad-frontend-extras/files/generic/offline-unplanned-haproxy.html
index 9e59137..dd3f764 100644
--- a/charm/launchpad-frontend-extras/files/generic/offline-unplanned-haproxy.html
+++ b/charm/launchpad-frontend-extras/files/generic/offline-unplanned-haproxy.html
@@ -32,8 +32,6 @@ Content-Type: text/html
               If we are in the middle of an update, Launchpad will be
               back in a couple of minutes.  Otherwise, we are working to
               fix the unexpected problems. Check
-              <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter or
               <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus@ubuntu.social</a>
               on Mastodon for updates.
             </p>
diff --git a/charm/launchpad-frontend-extras/files/generic/offline-unplanned.html b/charm/launchpad-frontend-extras/files/generic/offline-unplanned.html
index 4d8687c..ac1aa7a 100644
--- a/charm/launchpad-frontend-extras/files/generic/offline-unplanned.html
+++ b/charm/launchpad-frontend-extras/files/generic/offline-unplanned.html
@@ -25,8 +25,6 @@
               If we are in the middle of an update, Launchpad will be
               back in a couple of minutes.  Otherwise, we are working to
               fix the unexpected problems. Check
-              <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter or
               <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus@ubuntu.social</a>
               on Mastodon for updates.
             </p>
diff --git a/lib/lp/app/templates/launchpad-databaseunavailable.pt b/lib/lp/app/templates/launchpad-databaseunavailable.pt
index 1c8a80c..ee1b1e3 100644
--- a/lib/lp/app/templates/launchpad-databaseunavailable.pt
+++ b/lib/lp/app/templates/launchpad-databaseunavailable.pt
@@ -26,8 +26,6 @@
               If we are in the middle of an update, Launchpad will be
               back in a couple of minutes.  Otherwise, we are working to
               fix the unexpected problems. Check
-              <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter or
               <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus@ubuntu.social</a>
               on Mastodon for updates.
             </p>
diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
index 72b83a0..145d06d 100644
--- a/lib/lp/services/librarianserver/web.py
+++ b/lib/lp/services/librarianserver/web.py
@@ -147,8 +147,7 @@ class LibraryFileAliasResource(resource.Resource):
                 503,
                 "Database unavailable",
                 "A required database is unavailable.\n"
-                "See https://twitter.com/launchpadstatus "
-                "or https://ubuntu.social/@launchpadstatus "
+                "See https://ubuntu.social/@launchpadstatus "
                 "for maintenance and outage notifications.",
             )
         else: