Krinkle has submitted this change and it was merged.

Change subject: Update files and add doc.wikimedia.org
......................................................................


Update files and add doc.wikimedia.org

Cherry picked from 36118c58af5e972b8ae6d24c00b49d5d00ca7df6.

Change-Id: Ia70316f973f220170c03d9a2dddc9897164d889a
---
M org/mediawiki/integration/index.html
A org/wikimedia/doc/index.html
2 files changed, 25 insertions(+), 14 deletions(-)

Approvals:
  Krinkle: Verified; Looks good to me, approved



diff --git a/org/mediawiki/integration/index.html 
b/org/mediawiki/integration/index.html
index 8a1a56d..58ef4e8 100644
--- a/org/mediawiki/integration/index.html
+++ b/org/mediawiki/integration/index.html
@@ -2,9 +2,8 @@
 <html dir="ltr" lang="en-US">
 <head>
        <meta charset="utf-8">
-       <title>MediaWiki Continuous Integration</title>
-       <meta name="viewport" content="width=device-width, initial-scale=1.0, 
maximum-scale=1.0, user-scalable=no" />
-       <style type="text/css">
+       <title>Continuous Integration - Wikimedia</title>
+       <style>
        body {
                margin: 0;
                font-size: 14px;
@@ -55,39 +54,37 @@
 </head>
 <body>
        <div>
-               <img 
src="https://upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png"; 
class="logo">
+               <img 
src="//upload.wikimedia.org/wikipedia/commons/3/3d/Mediawiki-logo.png" 
class="logo">
                <h1>Welcome!</h1>
-               <p>This is our continous integration server for MediaWiki.</p>
-               <p>Right now, we are running Jenkins:</p>
+               <p>This the continous integration server for Wikimedia 
Foundation projects.</p>
                <ul>
-               <li><a href="ci/">Jenkins (PHPUnit/PHP)</a></li>
-               <li><s>TestSwarm (QUnit/Javascript)</s>, disabled</li>
+               <li><a href="/ci/">Jenkins</a></li>
+               <li><a href="/zuul/status">Zuul status</a></li>
                <li>Nightly builds:<br/>
                        <ul>
                        <li>
-                       <a href="nightly/mediawiki/core/">MediaWiki Core</a> 
(<a href="nightly/mediawiki/core/mediawiki-latest.zip">latest</a>)
+                       <a href="/nightly/mediawiki/core/">MediaWiki core</a> 
(<a href="/nightly/mediawiki/core/mediawiki-latest.zip">latest</a>)
                        </li>
                        <li>
                        <a href="/nightly/mobile/android-commons/">Commons</a> 
Android application
                        (github: <a 
href="https://github.com/wikimedia/android-commons";>android-commons</a>)
                        </li>
                        <li>
-                       <a href="WikipediaMobile/nightly/">Wikipedia</a> 
Android application
+                       <a href="/WikipediaMobile/nightly/">Wikipedia</a> 
Android application
                        (github: <a 
href="https://github.com/wikimedia/WikipediaMobile";>WikipediaMobile</a>)
                        </li>
                        <li>
-                       <a href="WiktionaryMobile/nightly/">Wiktionary</a> 
Android application
+                       <a href="/WiktionaryMobile/nightly/">Wiktionary</a> 
Android application
                        (github: <a 
href="https://github.com/wikimedia/WiktionaryMobile";>WiktionaryMobile</a>)
                        </li>
                        <li>
-                       <a href="WLMMobile/nightly/">Wikimedia Loves 
Monument</a> Android application
+                       <a href="/WLMMobile/nightly/">Wikimedia Loves 
Monument</a> Android application
                        (github: <a 
href="https://github.com/wikimedia/WLMMobile";>WLMMobile</a>)
                        </li>
                        </ul>
                </li>
                </ul>
-               <p>Our tools are available using either HTTP or HTTPS.</p>
-               <p>Questions? Comments? Concerns? Contact <em>^demon</em>, 
<em>Krinkle</em> or <em>hashar</em> on <a 
href="irc://irc.freenode.net/#mediawiki">#mediawiki</a>.</p>
+               <p>Questions? Comments? Concerns? Contact <em>^demon</em>, 
<em>Krinkle</em> or <em>hashar</em> on <a 
href="irc://irc.freenode.net/#wikimedia-dev">#wikimedia-dev</a>.</p>
        </div>
 </body>
 </html>
diff --git a/org/wikimedia/doc/index.html b/org/wikimedia/doc/index.html
new file mode 100644
index 0000000..93fa505
--- /dev/null
+++ b/org/wikimedia/doc/index.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html dir="ltr" lang="en-US">
+<head>
+       <meta charset="utf-8">
+       <title>Documentation - Wikimedia</title>
+</head>
+<body>
+       <h3>Documentation</h3>
+       <ul>
+               <li><a href="/puppet/">puppet</a></li>
+               <li><a href="/puppetsource/">puppetsource</a></li>
+       </ul>
+</body>
+</html>

-- 
To view, visit https://gerrit.wikimedia.org/r/53801
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia70316f973f220170c03d9a2dddc9897164d889a
Gerrit-PatchSet: 1
Gerrit-Project: integration/docroot
Gerrit-Branch: master
Gerrit-Owner: Krinkle <ttij...@wikimedia.org>
Gerrit-Reviewer: Krinkle <ttij...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to