From: Jan Andre Ikenmeyer <17962859+Darkspirit@users.noreply.github.com>
Date: Thu, 9 May 2019 22:38:35 +0000 (+0200)
Subject: Bug 1548725 - Change crash signature & report links from crash-stats.mozilla.com...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b87b6891ce4b61a1fc7363d4f0137166792a24d;p=thirdparty%2Fbugzilla.git
Bug 1548725 - Change crash signature & report links from crash-stats.mozilla.com to .org
---
diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm
index 802d8ceed..c86d03ae9 100644
--- a/Bugzilla/Constants.pm
+++ b/Bugzilla/Constants.pm
@@ -756,7 +756,7 @@ sub DEFAULT_CSP {
'https://treeherder.mozilla.org/api/failurecount/',
# socorro lens
- 'https://crash-stats.mozilla.com/api/SuperSearch/',
+ 'https://crash-stats.mozilla.org/api/SuperSearch/',
],
font_src => [ 'self', 'https://fonts.gstatic.com' ],
form_action => [
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index c34a567be..cf3695b09 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -688,7 +688,7 @@ sub bug_format_comment {
my $args = shift;
my $match = html_quote($args->{matches}->[0]);
return
- qq{bp-$match};
+ qq{bp-$match};
}
}
);
diff --git a/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl b/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl
index 02d7d8ebf..c5c457c32 100644
--- a/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug/edit-custom_field.html.tmpl
@@ -30,7 +30,7 @@
[% FOREACH sig = split_cf_crash_signature %]
[% IF sig.match('^\[\@\s*') && sig.match('\s*\]$') %]
[% sig = sig.replace('(^\[\@\s*|\s*\]$)', '') %]
- [@ [% sig FILTER html %] ]
[% ELSE %]
[% sig FILTER html %]
diff --git a/extensions/BMO/template/en/default/hook/bug_modal/edit-custom_field-cf_crash_signature.html.tmpl b/extensions/BMO/template/en/default/hook/bug_modal/edit-custom_field-cf_crash_signature.html.tmpl
index 016dbd902..05ef1f980 100644
--- a/extensions/BMO/template/en/default/hook/bug_modal/edit-custom_field-cf_crash_signature.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/bug_modal/edit-custom_field-cf_crash_signature.html.tmpl
@@ -18,7 +18,7 @@
[% IF sig.match('^\[\@\s*') && sig.match('\s*\]$') %]
[% sig = sig.replace('(^\[\@\s*|\s*\]$)', '') %]
-
+
[@ [% sig FILTER html %] ]
[% ELSE %]
diff --git a/extensions/BMO/web/js/firefox-crash-table.js b/extensions/BMO/web/js/firefox-crash-table.js
index 6735fa634..06ea4dd67 100644
--- a/extensions/BMO/web/js/firefox-crash-table.js
+++ b/extensions/BMO/web/js/firefox-crash-table.js
@@ -111,7 +111,7 @@ window.addEventListener('DOMContentLoaded', () => {
if (container) {
const signatures = [];
const selector = oldWay ? "cf_crash_signature_edit_container" : "field-value-cf_crash_signature";
- const baseCrashUrl = "https://crash-stats.mozilla.com/signature/?signature=";
+ const baseCrashUrl = "https://crash-stats.mozilla.org/signature/?signature=";
document.querySelectorAll("#" + selector + " a").forEach(a => {
if (a.href.startsWith(baseCrashUrl)) {
const encodedSignature = a.href.replace(baseCrashUrl, "")
@@ -125,7 +125,7 @@ window.addEventListener('DOMContentLoaded', () => {
});
const extraSocorroArgs = []
- const baseUrl = "https://crash-stats.mozilla.com/search/";
+ const baseUrl = "https://crash-stats.mozilla.org/search/";
const sayNo = new Set(["_columns", "_facets", "_facets_size", "_sort", "_results_number", "date", "channel", "product", "version", "build_id"]);
const urlSelector = oldWay ? "bz_url_edit_container" : "field-value-bug_file_loc";
document.querySelectorAll("#" + urlSelector + " a").forEach(a => {
diff --git a/public/metricsgraphics/js/main.js b/public/metricsgraphics/js/main.js
index 61f3b8675..6ab83c280 100644
--- a/public/metricsgraphics/js/main.js
+++ b/public/metricsgraphics/js/main.js
@@ -197,7 +197,7 @@ var items = [];
var end_date = convertDate(new Date((new Date()).valueOf() - 1000 * 60 * 60 * 24 * 1));
var start_date = convertDate(new Date((new Date()).valueOf() - 1000 * 60 * 60 * 24 * 180));
var globals = {
- "url_base": "https://crash-stats.mozilla.com/search/?",
+ "url_base": "https://crash-stats.mozilla.org/search/?",
"url": [],
"mouseover": function (d) {
var next = new Date(d.date.valueOf() + 1 * 24 * 60 * 60 * 1000);
@@ -326,7 +326,7 @@ function loadGraph(search, match = 'exact') {
if (!globals.url[i]) globals.url[i] = "";
globals.url[i] = globals.url_base + signatures[i];
// Iterate through the Socorro data and create the chart data object
- var url = "https://crash-stats.mozilla.com/api/SuperSearch/?" + signatures[i] + "&date=%3E%3D" + start_date + "&date=%3C%3D" + end_date + "&_histogram.date=release_channel&_histogram_interval=1d&_results_number=0";
+ var url = "https://crash-stats.mozilla.org/api/SuperSearch/?" + signatures[i] + "&date=%3E%3D" + start_date + "&date=%3C%3D" + end_date + "&_histogram.date=release_channel&_histogram_interval=1d&_results_number=0";
url = url.replace("/?&signature", "/?signature");
d3.json(url, function (data) {
if (data.total > 0) {
diff --git a/qa/t/test_bmo_autolinkification.t b/qa/t/test_bmo_autolinkification.t
index a8bce05cd..e156720dc 100644
--- a/qa/t/test_bmo_autolinkification.t
+++ b/qa/t/test_bmo_autolinkification.t
@@ -32,7 +32,7 @@ $sel->title_like(qr/\d+ \S $bug_summary/, "crash report added");
$sel->click_ok("link=bug $bug_id");
$sel->wait_for_page_to_load_ok(WAIT_TIME);
$sel->attribute_is('link=bp-63f096f7-253b-4ee2-ae3d-8bb782090824@href',
- 'https://crash-stats.mozilla.com/report/index/63f096f7-253b-4ee2-ae3d-8bb782090824'
+ 'https://crash-stats.mozilla.org/report/index/63f096f7-253b-4ee2-ae3d-8bb782090824'
);
$sel->type_ok("comment", "CVE-2010-2884");