From a7920a7dd780657cd20a36b2c2213c373c0ef8f3 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Sat, 1 Apr 2017 19:29:24 +0900
Subject: [PATCH 1/3] When using H2, caution message shows at sign-in.

---
 src/main/twirl/gitbucket/core/signin.scala.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/twirl/gitbucket/core/signin.scala.html b/src/main/twirl/gitbucket/core/signin.scala.html
index fa172d851..828388711 100644
--- a/src/main/twirl/gitbucket/core/signin.scala.html
+++ b/src/main/twirl/gitbucket/core/signin.scala.html
@@ -1,6 +1,7 @@
 @(userName: Option[Any] = None,
   password: Option[Any] = None,
   error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.util.DatabaseConfig
 @gitbucket.core.html.main("Sign in"){
   <div class="content-wrapper main-center">
     <div class="content body">
@@ -11,6 +12,12 @@
             @Html(information)
           </div>
         }
+        @if(DatabaseConfig.url.startsWith("jdbc:h2:")) {
+          <div class="alert alert-warning">
+            <button type="button" class="close" data-dismiss="alert">&times;</button>
+            H2 database should be used for evaluation purpose only.
+          </div>
+        }
         @gitbucket.core.helper.html.error(error)
         @gitbucket.core.html.signinform(context.settings, userName, password)
       </div>

From dcd4c55fb927afb124c36b198dc5d404ef941fb0 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Sat, 1 Apr 2017 20:55:36 +0900
Subject: [PATCH 2/3] Add caution message in System settings.

---
 .../twirl/gitbucket/core/admin/system.scala.html    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
index c78ad6d3a..c06702b32 100644
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -1,4 +1,5 @@
 @(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@import gitbucket.core.util.DatabaseConfig
 @gitbucket.core.html.main("System settings"){
   @gitbucket.core.admin.html.menu("system"){
     @gitbucket.core.helper.html.information(info)
@@ -20,7 +21,17 @@
             </tr>
             <tr>
               <td>DATABASE_URL</td>
-              <td>@gitbucket.core.util.DatabaseConfig.url</td>
+              @if(DatabaseConfig.url.startsWith("jdbc:h2:")) {
+              <td class="danger">
+                <p>@gitbucket.core.util.DatabaseConfig.url</p>
+                <p>H2 database should be used for evaluation purpose only.</p>
+                <p>
+                  Please configure using external database explained <a href="https://github.com/gitbucket/gitbucket/wiki/External-database-configuration">here</a>.
+                </p>
+              </td>
+              }else{
+                <td>@gitbucket.core.util.DatabaseConfig.url</td>
+              }
             </tr>
           </table>
           <!--====================================================================-->

From d0fa4da45a0802ca18bda24a9017f30b33e770b1 Mon Sep 17 00:00:00 2001
From: KOUNOIKE Yuusuke <kounoike.yuusuke@gmail.com>
Date: Sun, 2 Apr 2017 15:11:38 +0900
Subject: [PATCH 3/3] Remove message on sign-in dialog. and change message in
 System settings.

---
 src/main/twirl/gitbucket/core/admin/system.scala.html | 2 +-
 src/main/twirl/gitbucket/core/signin.scala.html       | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/admin/system.scala.html b/src/main/twirl/gitbucket/core/admin/system.scala.html
index c06702b32..46de04c5c 100644
--- a/src/main/twirl/gitbucket/core/admin/system.scala.html
+++ b/src/main/twirl/gitbucket/core/admin/system.scala.html
@@ -24,7 +24,7 @@
               @if(DatabaseConfig.url.startsWith("jdbc:h2:")) {
               <td class="danger">
                 <p>@gitbucket.core.util.DatabaseConfig.url</p>
-                <p>H2 database should be used for evaluation purpose only.</p>
+                <p>Embedded H2 database should be used for evaluation purpose only.</p>
                 <p>
                   Please configure using external database explained <a href="https://github.com/gitbucket/gitbucket/wiki/External-database-configuration">here</a>.
                 </p>
diff --git a/src/main/twirl/gitbucket/core/signin.scala.html b/src/main/twirl/gitbucket/core/signin.scala.html
index 828388711..fa172d851 100644
--- a/src/main/twirl/gitbucket/core/signin.scala.html
+++ b/src/main/twirl/gitbucket/core/signin.scala.html
@@ -1,7 +1,6 @@
 @(userName: Option[Any] = None,
   password: Option[Any] = None,
   error: Option[Any] = None)(implicit context: gitbucket.core.controller.Context)
-@import gitbucket.core.util.DatabaseConfig
 @gitbucket.core.html.main("Sign in"){
   <div class="content-wrapper main-center">
     <div class="content body">
@@ -12,12 +11,6 @@
             @Html(information)
           </div>
         }
-        @if(DatabaseConfig.url.startsWith("jdbc:h2:")) {
-          <div class="alert alert-warning">
-            <button type="button" class="close" data-dismiss="alert">&times;</button>
-            H2 database should be used for evaluation purpose only.
-          </div>
-        }
         @gitbucket.core.helper.html.error(error)
         @gitbucket.core.html.signinform(context.settings, userName, password)
       </div>