commit 0e1c508fb91f6af485d369f058d5ae108ef8b308
author Luca Milanesio <luca.milanesio@gmail.com> Thu Sep 17 21:38:20 2015 +0100
committer David Pursehouse <david.pursehouse@sonymobile.com> Fri Dec 04 10:51:36 2015 +0900
tree 38e6571bd94e54a0315a1876d6cbf4430319e9a9
parent 6528001ebd61ac5883a00274856dcfffa0c2c7ee

Supports multi-line MOTD messages

Allows a Gerrit administrator to display a multi-line
message by using the Git-style config string lists.

Very useful for adding banners, dividers, etc.

Example:
  [gerrit]
       motd = *************************************************
       motd = Gerrit User Summit 2015, 7th-8th Nov, GooglePlex
       motd = Register Now at http://goo.gl/forms/fifi2YQTc7
       motd = -------------------------------------------------
       motd = Hurry up, registration closes on Oct 1st.
       motd = *************************************************

Change-Id: I86c7ad3172fe3794dc87a839f02b8eaef7a876c0

src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java b/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java
index 07e5772..538465d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/motd/MotdFileBasedConfig.java
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.googlesource.gerrit.plugins.motd;
 
+import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.gerrit.server.config.SitePaths;
@@ -81,7 +82,8 @@
           config.getFile(), e.getMessage()), e);
     }
 
-    motd = config.getString("gerrit", null, "motd");
+    String[] motdLines = config.getStringList("gerrit", null, "motd");
+    motd = Joiner.on("\n").useForNull("").join(motdLines);
 
     ImmutableList.Builder<Subnet> subnetlist = ImmutableList.builder();
     for (SubnetConfig c : allSubnets(config)) {