From 5d6d68697dceec6a8c5a8947118abe527ad09ba1 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Thu, 28 Jun 2018 12:36:27 -0400
Subject: Remove metrics stuff

---
 template/en/default/admin/params/advanced.html.tmpl | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl
index 7c85881d7..2fe59c533 100644
--- a/template/en/default/admin/params/advanced.html.tmpl
+++ b/template/en/default/admin/params/advanced.html.tmpl
@@ -25,7 +25,7 @@
 %]
 
 [% sts_desc = BLOCK %]
-  Enables the sending of the 
+  Enables the sending of the
   <a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security">Strict-Transport-Security</a>
   header along with HTTP responses on SSL connections. This adds greater
   security to your SSL connections by forcing the browser to always
@@ -67,18 +67,4 @@
 
   disable_bug_updates =>
     "When enabled, all updates to $terms.bugs will be blocked.",
-
-  metrics_enabled =>
-    "Collect metrics for reporting to ElasticSearch",
-  metrics_user_ids =>
-    "Comma separated list of user_id's which trigger data collection and reporting."
-    _ " eg <kbd>3881,5038,5898,13647,20209,251051,373476,409787</kbd>.",
-  metrics_elasticsearch_server =>
-    "Metrics ElasticSearch server and port. eg <kbd>127.0.0.1:9200</kbd>",
-  metrics_elasticsearch_index =>
-    "Metrics ElasticSearch index. eg <kbd>bmo-metrics</kbd>",
-  metrics_elasticsearch_type =>
-    "Metrics ElasticSearch type. eg <kbd>timings</kbd>",
-  metrics_elasticsearch_ttl =>
-    "The time to live for data in the ElasticSearch cluster, in milliseconds. eg <kbd>1210000000</kbd>",
 } %]
-- 
cgit v1.2.3-24-g4f1b


From cdc26a69674ea7a3413efce2f8d4e3225c6ab76e Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Wed, 4 Apr 2018 22:18:58 -0400
Subject: render bugzilla templates using mojo

---
 template/en/default/global/header.html.tmpl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'template/en/default')

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 153137394..b286830fc 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -97,6 +97,10 @@
     [% IF Param('utf8') %]
       <meta charset="UTF-8">
     [% END %]
+    [% USE Bugzilla %]
+    [% IF Bugzilla.usage_mode == constants.USAGE_MODE_MOJO %]
+      <base href="[% urlbase FILTER html %]">
+    [% END %]
 
     [% IF Bugzilla.cgi.should_block_referrer %]
       <meta name="referrer" content="origin">
-- 
cgit v1.2.3-24-g4f1b


From 541e2b41af8cc44ad3eb0638618bc457c666d612 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sat, 7 Apr 2018 19:20:00 -0400
Subject: a bit of a quantum leap

It's now possible to load the CGIs into a mojolicious controller.
Compatibility isn't 100% yet, but it should give a migration path
for any random CGI to become a proper controller.
---
 template/en/default/global/header.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template/en/default')

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index b286830fc..196cf25d2 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -98,7 +98,7 @@
       <meta charset="UTF-8">
     [% END %]
     [% USE Bugzilla %]
-    [% IF Bugzilla.usage_mode == constants.USAGE_MODE_MOJO %]
+    [% IF Bugzilla.usage_mode == constants.USAGE_MODE_QUANTUM %]
       <base href="[% urlbase FILTER html %]">
     [% END %]
 
-- 
cgit v1.2.3-24-g4f1b


From c4b893ce10c982d242fcc540e937fca8e0336bde Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sat, 7 Apr 2018 22:30:44 -0400
Subject: fix path stuff

---
 template/en/default/global/header.html.tmpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'template/en/default')

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 196cf25d2..3d86dcf24 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -109,6 +109,7 @@
     [% END %]
 
     [%- js_BUGZILLA = {
+            QUANTUM => Bugzilla.usage_mode == constants.USAGE_MODE_QUANTUM,
             param => {
                 maxattachmentsize => Param('maxattachmentsize'),
                 maxusermatches => Param('maxusermatches'),
-- 
cgit v1.2.3-24-g4f1b


From 216af94b979206ee77d3f3b783648a959b120547 Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Sat, 19 May 2018 11:33:46 -0400
Subject: more things

---
 template/en/default/global/header.html.tmpl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 3d86dcf24..17cac3cb8 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -98,9 +98,7 @@
       <meta charset="UTF-8">
     [% END %]
     [% USE Bugzilla %]
-    [% IF Bugzilla.usage_mode == constants.USAGE_MODE_QUANTUM %]
-      <base href="[% urlbase FILTER html %]">
-    [% END %]
+    <base href="[% urlbase FILTER html %]">
 
     [% IF Bugzilla.cgi.should_block_referrer %]
       <meta name="referrer" content="origin">
@@ -109,7 +107,6 @@
     [% END %]
 
     [%- js_BUGZILLA = {
-            QUANTUM => Bugzilla.usage_mode == constants.USAGE_MODE_QUANTUM,
             param => {
                 maxattachmentsize => Param('maxattachmentsize'),
                 maxusermatches => Param('maxusermatches'),
-- 
cgit v1.2.3-24-g4f1b