Skip to content

Commit 38e5de9

Browse files
authored
Merge branch 'stable32' into HotFix-sharee-enumeration-disabled-users-shall-be-only-searched-by-email
2 parents 4cc0718 + 450633e commit 38e5de9

2,737 files changed

Lines changed: 73177 additions & 41671 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/cypress.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ jobs:
102102
matrix:
103103
# Run multiple copies of the current job in parallel
104104
# Please increase the number or runners as your tests suite grows (0 based index for e2e tests)
105-
containers: ['component', 'setup', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
106-
# Hack as strategy.job-total includes the component and GitHub does not allow math expressions
105+
containers: ['setup', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
106+
# Hack as strategy.job-total includes the "setup" and GitHub does not allow math expressions
107107
# Always align this number with the total of e2e runners (max. index + 1)
108108
total-containers: [10]
109109

110110
services:
111111
mysql:
112112
# Only start mysql if we are running the setup tests
113-
image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-mysql-8.4:latest' || ''}}
113+
image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-mysql-8.4:latest' || ''}} # zizmor: ignore[unpinned-images]
114114
ports:
115115
- '3306/tcp'
116116
env:
@@ -122,7 +122,7 @@ jobs:
122122

123123
mariadb:
124124
# Only start mariadb if we are running the setup tests
125-
image: ${{matrix.containers == 'setup' && 'mariadb:11.4' || ''}}
125+
image: ${{matrix.containers == 'setup' && 'mariadb:11.4' || ''}} # zizmor: ignore[unpinned-images]
126126
ports:
127127
- '3306/tcp'
128128
env:
@@ -134,7 +134,7 @@ jobs:
134134

135135
postgres:
136136
# Only start postgres if we are running the setup tests
137-
image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-postgres-17:latest' || ''}}
137+
image: ${{matrix.containers == 'setup' && 'ghcr.io/nextcloud/continuous-integration-postgres-17:latest' || ''}} # zizmor: ignore[unpinned-images]
138138
ports:
139139
- '5432/tcp'
140140
env:
@@ -145,7 +145,7 @@ jobs:
145145

146146
oracle:
147147
# Only start oracle if we are running the setup tests
148-
image: ${{matrix.containers == 'setup' && 'ghcr.io/gvenzl/oracle-free:23' || ''}}
148+
image: ${{matrix.containers == 'setup' && 'ghcr.io/gvenzl/oracle-free:23' || ''}} # zizmor: ignore[unpinned-images]
149149
ports:
150150
- '1521'
151151
env:

.github/workflows/dependabot-approve-merge.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
# https://github.com/nextcloud/.github
44
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
55
#
6-
# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors
6+
# SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
77
# SPDX-License-Identifier: MIT
88

9-
name: Dependabot
9+
name: Auto approve Dependabot PRs
1010

1111
on:
1212
pull_request_target: # zizmor: ignore[dangerous-triggers]
@@ -29,6 +29,8 @@ jobs:
2929
permissions:
3030
# for hmarr/auto-approve-action to approve PRs
3131
pull-requests: write
32+
# for alexwilson/enable-github-automerge-action to approve PRs
33+
contents: write
3234

3335
steps:
3436
- name: Disabled on forks
@@ -37,13 +39,20 @@ jobs:
3739
echo 'Can not approve PRs from forks'
3840
exit 1
3941
42+
- uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
43+
id: branchname
44+
with:
45+
repo-token: ${{ secrets.GITHUB_TOKEN }}
46+
4047
# GitHub actions bot approve
41-
- uses: hmarr/auto-approve-action@b40d6c9ed2fa10c9a2749eca7eb004418a705501 # v2
48+
- uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
49+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
4250
with:
4351
github-token: ${{ secrets.GITHUB_TOKEN }}
4452

45-
# Nextcloud bot approve and merge request
46-
- uses: ahmadnassri/action-dependabot-auto-merge@45fc124d949b19b6b8bf6645b6c9d55f4f9ac61a # v2
53+
# Enable GitHub auto merge
54+
- name: Auto merge
55+
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
56+
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
4757
with:
48-
target: minor
49-
github-token: ${{ secrets.DEPENDABOT_AUTOMERGE_TOKEN }}
58+
github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/integration-sqlite.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ jobs:
6262
- '--tags ~@large files_features'
6363
- 'filesdrop_features'
6464
- 'file_conversions'
65+
- 'files_reminders'
6566
- 'openldap_features'
6667
- 'openldap_numerical_features'
6768
- 'ldap_features'

.github/workflows/performance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
before.json
106106
after.json
107107
108-
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
108+
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
109109
if: failure() && steps.compare.outcome == 'failure'
110110
with:
111111
github-token: ${{secrets.GITHUB_TOKEN}}

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
issues: write
2121

2222
steps:
23-
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9
23+
- uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
2424
with:
2525
repo-token: ${{ secrets.COMMAND_BOT_PAT }}
2626
stale-issue-message: >

.github/workflows/static-code-analysis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@ jobs:
5757

5858
if: ${{ github.repository_owner != 'nextcloud-gmbh' }}
5959

60+
permissions:
61+
security-events: write
62+
6063
steps:
6164
- name: Checkout code
6265
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
@@ -83,7 +86,7 @@ jobs:
8386

8487
- name: Upload Security Analysis results to GitHub
8588
if: always()
86-
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3
89+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.7
8790
with:
8891
sarif_file: results.sarif
8992

3rdparty

Submodule 3rdparty updated 529 files

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Enterprise? Public Sector or Education user? You may want to have a look into [*
3535
## Get in touch 💬
3636

3737
* [📋 Forum](https://help.nextcloud.com)
38+
* [🦋 Bluesky](https://bsky.app/profile/nextcloud.bsky.social)
3839
* [👥 Facebook](https://www.facebook.com/nextclouders)
39-
* [🐣 Twitter](https://twitter.com/Nextclouders)
4040
* [🐘 Mastodon](https://mastodon.xyz/@nextcloud)
4141

4242
You can also [get support for Nextcloud](https://nextcloud.com/support)!

__tests__/setup-global.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: CC0-1.0
44
*/
5+
56
export function setup() {
67
process.env.TZ = 'UTC'
78
}

__tests__/setup-testing-library.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
33
* SPDX-License-Identifier: CC0-1.0
44
*/
5+
56
import '@testing-library/jest-dom/vitest'
67
import 'core-js/stable/index.js'

0 commit comments

Comments
 (0)