diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-10-14 18:19:50 +0200 |
| commit | ce00a61057535d49aa0e83181a1d317d7842571b (patch) | |
| tree | 280243de9ff791449fb2c82f3f0f2b9bd931d5b2 /extensions/GuidedBugEntry | |
| parent | 6367a26da4093a8379e370ef328e9507c98b2e7e (diff) | |
| parent | 6657fa9f5210d5b5a9b14c0cba6882bd56232054 (diff) | |
| download | bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.gz bugzilla-ce00a61057535d49aa0e83181a1d317d7842571b.tar.xz | |
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'extensions/GuidedBugEntry')
4 files changed, 2 insertions, 8 deletions
diff --git a/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl b/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl index 31408b538..153869f2f 100644 --- a/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl @@ -1,8 +1,6 @@ [% USE Bugzilla %] [% cgi = Bugzilla.cgi %] User Agent: [% cgi.param('user_agent') %] -[% IF cgi.param('build_id') %] -Build ID: [% cgi.param('build_id') %][% END %] [% IF cgi.param('firefox_for_android') %] Firefox for Android [% END %] diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl index 7ffa04922..07d814839 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl @@ -351,7 +351,6 @@ Product: <b><span id="dupes_product_name">?</span></b>: <input type="hidden" name="comment" id="comment" value=""> <input type="hidden" name="format" value="guided"> <input type="hidden" name="user_agent" id="user_agent" value=""> -<input type="hidden" name="build_id" id="build_id" value=""> <ul> <li>Please fill out this form clearly, precisely and in as much detail as you can manage.</li> diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js index 77847fb2e..5f3543153 100644 --- a/extensions/GuidedBugEntry/web/js/guided.js +++ b/extensions/GuidedBugEntry/web/js/guided.js @@ -614,9 +614,6 @@ var bugForm = { onInit: function() { var user_agent = navigator.userAgent; Dom.get('user_agent').value = navigator.userAgent; - if (navigator.buildID && navigator.buildID != navigator.userAgent) { - Dom.get('build_id').value = navigator.buildID; - } Event.addListener(Dom.get('short_desc'), 'blur', function() { Dom.get('dupes_summary').value = Dom.get('short_desc').value; guided.setAdvancedLink(); diff --git a/extensions/GuidedBugEntry/web/js/products.js b/extensions/GuidedBugEntry/web/js/products.js index 8ef1ea0c0..65dc04393 100644 --- a/extensions/GuidedBugEntry/web/js/products.js +++ b/extensions/GuidedBugEntry/web/js/products.js @@ -122,12 +122,12 @@ var products = { "Bugzilla": { support: - 'Please use <a href="https://landfill.bugzilla.org/">Bugzilla Landfill</a> to file "test bugs".' + 'Please use <a href="https://bugzilla-dev.allizom.org/">our test server</a> to file "test bugs".' }, "bugzilla.mozilla.org": { related: [ "Bugzilla" ], support: - 'Please use <a href="https://landfill.bugzilla.org/">Bugzilla Landfill</a> to file "test bugs".' + 'Please use <a href="https://bugzilla-dev.allizom.org/">our test server</a> to file "test bugs".' } }; |