launchpad-reviewers team mailing list archive

[Jürgen Gmach <mp+436658@xxxxxxxxxxxxxxxxxx>]

Jürgen Gmach has proposed merging ~jugmac00/launchpad:update-social-media-contacts into launchpad:master.

Commit message:
Add Mastodon account for status updates

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jugmac00/launchpad/+git/launchpad/+merge/436658
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~jugmac00/launchpad:update-social-media-contacts into launchpad:master.

diff --git a/lib/canonical/launchpad/offline-maintenance-haproxy.html b/lib/canonical/launchpad/offline-maintenance-haproxy.html
index 329ae2e..2add929 100644
--- a/lib/canonical/launchpad/offline-maintenance-haproxy.html
+++ b/lib/canonical/launchpad/offline-maintenance-haproxy.html
@@ -31,7 +31,9 @@ Content-Type: text/html
             <p>
               We'll be back soon. Check
               <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus</a>
+              on Mastodon for updates.
             </p>
             <p><a href="javascript:window.location.reload()">Reload</a>
               this page or try again in a few minutes</p>
diff --git a/lib/canonical/launchpad/offline-maintenance.html b/lib/canonical/launchpad/offline-maintenance.html
index 2ed31ff..3cf5f61 100644
--- a/lib/canonical/launchpad/offline-maintenance.html
+++ b/lib/canonical/launchpad/offline-maintenance.html
@@ -24,7 +24,9 @@
             <p>
               We'll be back soon. Check
               <a href="https://twitter.com/launchpadstatus";>@launchpadstatus</a>
-              on Twitter for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus</a>
+              on Mastodon for updates.
             </p>
             <p><a href="javascript:window.location.reload()">Reload</a>
               this page or try again in a few minutes</p>
diff --git a/lib/canonical/launchpad/offline-unplanned-haproxy.html b/lib/canonical/launchpad/offline-unplanned-haproxy.html
index 04965a0..183363c 100644
--- a/lib/canonical/launchpad/offline-unplanned-haproxy.html
+++ b/lib/canonical/launchpad/offline-unplanned-haproxy.html
@@ -33,7 +33,9 @@ Content-Type: text/html
               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 for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus</a>
+              on Mastodon for updates.
             </p>
             <p>
               If the problem persists, let us know in
diff --git a/lib/canonical/launchpad/offline-unplanned.html b/lib/canonical/launchpad/offline-unplanned.html
index ef1717a..4d17e73 100644
--- a/lib/canonical/launchpad/offline-unplanned.html
+++ b/lib/canonical/launchpad/offline-unplanned.html
@@ -26,7 +26,9 @@
               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 for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus</a>
+              on Mastodon for updates.
             </p>
             <p>
               If the problem persists, let us know in
diff --git a/lib/lp/app/browser/doc/base-layout.rst b/lib/lp/app/browser/doc/base-layout.rst
index c9d4758..113afec 100644
--- a/lib/lp/app/browser/doc/base-layout.rst
+++ b/lib/lp/app/browser/doc/base-layout.rst
@@ -162,7 +162,8 @@ Page Footers
     Contact Launchpad Support /feedback
     Blog http://blog.launchpad.net/
     Careers https://canonical.com/careers
-    System status https://twitter.com/launchpadstatus
+    Twitter https://twitter.com/launchpadstatus
+    Mastodon https://ubuntu.social/@launchpadstatus
     Get the code! https://dev.launchpad.net/
 
 
diff --git a/lib/lp/app/templates/base-layout-macros.pt b/lib/lp/app/templates/base-layout-macros.pt
index 54980ff..338aefb 100644
--- a/lib/lp/app/templates/base-layout-macros.pt
+++ b/lib/lp/app/templates/base-layout-macros.pt
@@ -305,8 +305,9 @@
 		>Careers</a>
       </tal:careers_link>
       &nbsp;&bull;&nbsp;
-      <a href="https://twitter.com/launchpadstatus";
-        >System status</a>
+      System Status
+      <a href="https://twitter.com/launchpadstatus";>Twitter</a> |
+      <a href="https://ubuntu.social/@launchpadstatus";>Mastodon</a>
       <span id="lp-version">
       &nbsp;&bull;&nbsp;
         <tal:display_revision replace="display_revision" />
diff --git a/lib/lp/app/templates/launchpad-databaseunavailable.pt b/lib/lp/app/templates/launchpad-databaseunavailable.pt
index 1e7d025..f50054e 100644
--- a/lib/lp/app/templates/launchpad-databaseunavailable.pt
+++ b/lib/lp/app/templates/launchpad-databaseunavailable.pt
@@ -27,7 +27,9 @@
               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 for updates.
+              on Twitter or
+              <a href="https://ubuntu.social/@launchpadstatus";>@launchpadstatus</a>
+              on Mastodon for updates.
             </p>
             <p>
               If the problem persists, let us know in
diff --git a/lib/lp/services/librarianserver/web.py b/lib/lp/services/librarianserver/web.py
index 17a356e..4df0cb8 100644
--- a/lib/lp/services/librarianserver/web.py
+++ b/lib/lp/services/librarianserver/web.py
@@ -148,6 +148,7 @@ class LibraryFileAliasResource(resource.Resource):
                 "Database unavailable",
                 "A required database is unavailable.\n"
                 "See https://twitter.com/launchpadstatus "
+                "or https://ubuntu.social/@launchpadstatus";
                 "for maintenance and outage notifications.",
             )
         else: