Skip to content

Commit 21d827f

Browse files
committed
Merge branch 'release_24.2' into release_25.0
2 parents abacf1b + dfbb3d8 commit 21d827f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/galaxy/webapps/galaxy/services/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def get_index(
203203
f_any: Optional[str],
204204
) -> List[MaybeLimitedUserModel]:
205205
# never give any info to non-authenticated users
206-
if not trans.user:
206+
if not trans.user and not trans.user_is_bootstrap_admin:
207207
raise glx_exceptions.AuthenticationRequired("Only registered users can view the list of users")
208208

209209
# check for early return conditions

test/unit/tool_util/mulled/test_mulled_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@pytest.mark.parametrize(
1919
"target,version,base_image",
2020
[
21-
("maker", None, DEFAULT_EXTENDED_BASE_IMAGE),
21+
("mzmine", None, DEFAULT_EXTENDED_BASE_IMAGE),
2222
("qiime", "1.9.1", DEFAULT_EXTENDED_BASE_IMAGE),
2323
("samtools", None, DEFAULT_BASE_IMAGE),
2424
],

0 commit comments

Comments
 (0)