diff options
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/account/auth/login.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/activity/table.html.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/email/new-api-key.txt.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 6 |
4 files changed, 16 insertions, 1 deletions
diff --git a/template/en/default/account/auth/login.html.tmpl b/template/en/default/account/auth/login.html.tmpl index 160fad43b..8cf5e85ef 100644 --- a/template/en/default/account/auth/login.html.tmpl +++ b/template/en/default/account/auth/login.html.tmpl @@ -42,7 +42,7 @@ </p> <div id="login" class="login-form"> - <form name="login" action="[% target FILTER html %]" method="POST" + <form name="login" action="[% urlbase FILTER html %][% target FILTER uri FILTER html %]" method="POST" [%- IF Bugzilla.cgi.param("data") %] enctype="multipart/form-data"[% END %]> <div class="field-login"> <label for="Bugzilla_login">Email Address:</label> diff --git a/template/en/default/bug/activity/table.html.tmpl b/template/en/default/bug/activity/table.html.tmpl index 50193f894..101e43546 100644 --- a/template/en/default/bug/activity/table.html.tmpl +++ b/template/en/default/bug/activity/table.html.tmpl @@ -107,6 +107,7 @@ change.fieldname == 'reporter' || change.fieldname == 'qa_contact' || change.fieldname == 'cc' || + change.fieldname == 'bug_mentor' || change.fieldname == 'flagtypes.name' %] [% display_value(change.fieldname, change_type) FILTER email FILTER html %] [% ELSE %] diff --git a/template/en/default/email/new-api-key.txt.tmpl b/template/en/default/email/new-api-key.txt.tmpl index 4a03fe800..aed904def 100644 --- a/template/en/default/email/new-api-key.txt.tmpl +++ b/template/en/default/email/new-api-key.txt.tmpl @@ -26,9 +26,17 @@ or update the key at the following URL: [%+ urlbase %]userprefs.cgi?tab=apikey +[% IF new_key.app_id == Param('mozreview_app_id') %] +This API key was automatically created by MozReview. If you did not recently log in to +MozReview, please disable the key at the above URL, and change your password immediately. +[% ELSIF new_key.app_id == Param('phabricator_app_id') %] +This API key was automatically created by Mozilla's Phabricator instance. If you did not recently +log in to Phabricator, please disable the key at the above URL, and change your password immediately. +[% ELSE %] IMPORTANT: If you did not request a new key, your [% terms.Bugzilla %] account may have been compromised. In this case, please disable the key at the above URL, and change your password immediately. +[% END %] For security reasons, we have not included your new key in this e-mail. diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index 9de426972..5fc860519 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -269,6 +269,12 @@ END This is the max amount of unshared memory the apache process is allowed to use before Apache::SizeLimit kills it. This is only applicable when run under mod_perl. EOT + localconfig_shadowdb_user => <<EOT, +The username used to authenticate to the shadow db. +EOT + localconfig_shadowdb_pass => <<EOT, +The password used to authenticate to the shadow db. +EOT max_allowed_packet => <<EOT, WARNING: You need to set the max_allowed_packet parameter in your MySQL configuration to at least ##needed##. Currently it is set to ##current##. |