Skip to content

Commit 4583179

Browse files
committed
Merge branch 'master' into development
* master: Bug 1989605 - Don't allow brand-new accounts to use the Triage Request Form to self-grant Bug 1988243 - When a bot account is in the duo_excluded group it is still required to setup Duo only as 2FA and not TOTP Bug 1988707 - Clarify the User Statistics is updated daily Bug 1987016 - Apply better styling for disabled checkboxes Bumped version to 20250903.1 Bug 1986495 - Optimize bug updates in Phabbugz by converting to a single update Bug 1985621: trigger uplift changes when hash of last form changes
2 parents 719858a + 1c734cc commit 4583179

File tree

7 files changed

+32
-10
lines changed

7 files changed

+32
-10
lines changed

Bugzilla.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use warnings;
1313

1414
use Bugzilla::Logging;
1515

16-
our $VERSION = '20250825.1';
16+
our $VERSION = '20250903.1';
1717

1818
use Bugzilla::Auth;
1919
use Bugzilla::Auth::Persist::Cookie;

extensions/BMO/Extension.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ sub parse_bounty_attachment_description {
417417
sub triage_request {
418418
my ($vars) = @_;
419419
my $user = Bugzilla->login(LOGIN_REQUIRED);
420-
if (Bugzilla->input_params->{update}) {
420+
if (!$user->is_new && Bugzilla->input_params->{update}) {
421421
Bugzilla->set_user(Bugzilla::User->super_user);
422422
$user->set_groups({add => ['canconfirm']});
423423
Bugzilla->set_user($user);

extensions/BMO/template/en/default/pages/get_permissions.html.tmpl

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@
1212

1313
<h3>How to apply for upgraded permissions</h3>
1414

15-
<p>
16-
If you want <kbd>canconfirm</kbd>, you can add it yourself using
17-
the <a href="[% basepath FILTER none %]page.cgi?id=triage_request.html">triage request form</a>.
18-
</p>
15+
[% IF !user.is_new %]
16+
<p>
17+
If you want <kbd>canconfirm</kbd>, you can add it yourself using
18+
the <a href="[% basepath FILTER none %]page.cgi?id=triage_request.html">triage request form</a>.
19+
</p>
20+
[% END %]
1921

2022
[% editbugs = basepath _ "enter_bug.cgi?assigned_to=nobody%40mozilla.org&bug_file_loc=http%3A%2F%2F&bug_ignored=0&bug_type=task&bug_severity=--&bug_status=NEW&cf_fx_iteration=---&cf_fx_points=---&component=Editbugs%20Requests&contenttypemethod=autodetect&contenttypeselection=text%2Fplain&defined_groups=1&flag_type-4=X&flag_type-607=X&flag_type-791=X&flag_type-800=X&flag_type-803=X&flag_type-916=X&form_name=enter_bug&maketemplate=Remember%20values%20as%20bookmarkable%20template&op_sys=Unspecified&priority=--&product=bugzilla.mozilla.org&rep_platform=Unspecified&target_milestone=---&version=Production" %]
2123

extensions/BMO/template/en/default/pages/triage_request.html.tmpl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,13 @@
4747
faster.
4848
</p>
4949

50+
[% ELSIF user.is_new %]
51+
52+
<p>
53+
Your account is still too new to request the ability to triage [% terms.bugs %].
54+
Please check back at a later time to see when you will become eligible.
55+
</p>
56+
5057
[% ELSE %]
5158

5259
<p>

extensions/UserProfile/template/en/default/pages/user_profile.html.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@
204204
<td colspan="4" class="separator"><hr></td>
205205
</tr>
206206
<tr>
207-
<td>User Statistics</td>
207+
<td>User Statistics (Updated daily)</td>
208208
</tr>
209209

210210
<tr>

skins/standard/global.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -779,6 +779,19 @@ input[type="checkbox"]:checked {
779779
background-size: 18px 18px;
780780
}
781781

782+
input[type="checkbox"]:disabled {
783+
border-color: var(--disabled-button-foreground-color);
784+
background-color: var(--disabled-button-background-color);
785+
border-width: 1px;
786+
cursor: default;
787+
}
788+
789+
input[type="checkbox"]:disabled:checked {
790+
border-color: var(--disabled-control-foreground-color);
791+
background-color: var(--disabled-control-foreground-color);
792+
cursor: default;
793+
}
794+
782795
input[type="radio"] {
783796
border-radius: 50%;
784797
}

template/en/default/account/prefs/mfa.html.tmpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</iframe>
5757

5858
[% ELSIF user.mfa %]
59-
[% IF user.mfa != 'Duo' && user.in_duo_required_group %]
59+
[% IF user.mfa != 'Duo' && user.in_duo_required_group && !user.in_duo_excluded_group %]
6060
<p class="mfa-warning-msg">
6161
You are in a group requiring Duo Security for two-factor authentication. You must
6262
first disabled your current two-factor authentication and then select Duo Security
@@ -77,9 +77,9 @@
7777
<input type="hidden" name="mfa_action" id="mfa-action" value="disable">
7878

7979
<div class="mfa-buttons">
80-
[% IF user.mfa == 'Duo' && user.in_duo_required_group %]
80+
[% IF user.mfa == 'Duo' && user.in_duo_required_group && !user.in_duo_excluded_group %]
8181
<p class="mfa-warning-msg">
82-
You are in a group requiring Duo Security for two-factor authentication and
82+
You are in a group requiring Duo Security for two-factor authentication and
8383
therefore it cannot be disabled. Talk to an admin on Slack (#bmo) if you need assistance.
8484
</p>
8585
[% ELSIF user.mfa != 'Duo' || (user.mfa == 'Duo' && !user.in_duo_required_group) %]

0 commit comments

Comments
 (0)