Skip to content

Commit d19293e

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix/skip-RemoveBrokenProperties-if-already-run
2 parents c24cf8d + 5d7425b commit d19293e

4,564 files changed

Lines changed: 160014 additions & 81611 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/CODEOWNERS

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/__mocks__ @nextcloud/server-frontend
1111
/__tests__ @nextcloud/server-frontend
1212
/dist @nextcloud/server-frontend
13-
/cypress @nextcloud/server-frontend
13+
/tests/playwright @nextcloud/server-frontend
1414
**/css @nextcloud/server-frontend
1515
**/js @nextcloud/server-frontend
1616
**/src @nextcloud/server-frontend
@@ -25,7 +25,7 @@ package-lock.json @nextcloud/server-dependabot
2525

2626
# App maintainers
2727
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @samin-z
28-
/apps/cloud_federation_api/appinfo/info.xml @nfebe @mejo-
28+
/apps/cloud_federation_api/appinfo/info.xml @mejo-
2929
/apps/comments/appinfo/info.xml @edward-ly @sorbaugh
3030
/apps/contactsinteraction/appinfo/info.xml @kesselb @SebastianKrupinski
3131
/apps/contactsinteraction/lib @kesselb @SebastianKrupinski
@@ -37,17 +37,17 @@ package-lock.json @nextcloud/server-dependabot
3737
/apps/dav/tests/unit/CardDAV @hamza221 @SebastianKrupinski
3838
/apps/encryption/appinfo/info.xml @come-nc @icewind1991
3939
/apps/federatedfilesharing/appinfo/info.xml @icewind1991 @danxuliu
40-
/apps/federation/appinfo/info.xml @nfebe @sorbaugh
41-
/apps/files/appinfo/info.xml @skjnldsv @ArtificialOwl @come-nc @artonge @icewind1991 @szaimen @susnux @nfebe
40+
/apps/federation/appinfo/info.xml @sorbaugh
41+
/apps/files/appinfo/info.xml @skjnldsv @icewind1991 @szaimen @susnux
4242
/apps/files_external/appinfo/info.xml @icewind1991 @artonge
4343
/apps/files_reminders/appinfo/info.xml @skjnldsv @sorbaugh
44-
/apps/files_sharing/appinfo/info.xml @skjnldsv @come-nc
44+
/apps/files_sharing/appinfo/info.xml @skjnldsv @provokateurin
4545
/apps/files_trashbin/appinfo/info.xml @icewind1991 @sorbaugh
4646
/apps/files_versions/appinfo/info.xml @artonge @icewind1991
4747
/apps/oauth2/appinfo/info.xml @julien-nc @ChristophWurst
4848
/apps/provisioning_api/appinfo/info.xml @provokateurin @nickvergessen
4949
/apps/settings/appinfo/info.xml @hweihwang @sorbaugh
50-
/apps/sharebymail/appinfo/info.xml @Altahrim @skjnldsv
50+
/apps/sharebymail/appinfo/info.xml @provokateurin @skjnldsv
5151
/apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr
5252
/apps/theming/appinfo/info.xml @skjnldsv @juliusknorr
5353
/apps/twofactor_backupcodes/appinfo/info.xml @miaulalala @ChristophWurst

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,16 @@ body:
2626
label: "⚠️ This issue respects the following points: ⚠️"
2727
description: All conditions are **required**. Your issue can be closed if these are checked incorrectly.
2828
options:
29-
- label: This is a **bug**, not a question or a configuration/webserver/proxy issue.
29+
- label: This is **not** a troubleshooting question, general support matter, or webserver/proxy problem, but likely a bug _(if unsure, ask the [Community Help Forum](https://help.nextcloud.com))_.
3030
required: true
31-
- label: This issue is **not** already reported on [Github](https://github.com/nextcloud/server/issues?q=is%3Aopen+is%3Aissue+label%3Abug) OR [Nextcloud Community Forum](https://help.nextcloud.com/) _(I've searched it)_.
31+
- label: This issue is **not** already reported on [Github](https://github.com/nextcloud/server/issues?q=is%3Aissue+label%3Abug) OR solved at the [Community Help Forum](https://help.nextcloud.com/) _(I've searched!)_.
3232
required: true
33-
- label: Nextcloud Server **is** up to date. See [Maintenance and Release Schedule](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule) for supported versions.
33+
- label: I'm using a maintained major version of Nextcloud Server **and** tested against the latest patch level. _([Supported major versions and current patch levels](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule))_.
3434
required: true
3535
- label: I agree to follow Nextcloud's [Code of Conduct](https://nextcloud.com/contribute/code-of-conduct/).
3636
required: true
37+
- label: I've tried my best to provide clear reproduction steps that someone unfamiliar with this bug could use to reproduce it.
38+
required: true
3739
- type: textarea
3840
id: bug-description
3941
attributes:
@@ -74,7 +76,8 @@ body:
7476
- "32"
7577
- "33"
7678
- "34"
77-
- "35 (master)"
79+
- "35"
80+
- "36 (master)"
7881
validations:
7982
required: true
8083
- type: dropdown

.github/dependabot.yml

Lines changed: 76 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ updates:
1616
labels:
1717
- "3. to review"
1818
- "feature: dependencies"
19+
cooldown:
20+
default-days: 7
1921

2022
# Main composer (linting, testing, openapi)
2123
- package-ecosystem: composer
@@ -35,6 +37,10 @@ updates:
3537
labels:
3638
- "3. to review"
3739
- "feature: dependencies"
40+
open-pull-requests-limit: 20
41+
versioning-strategy: increase
42+
cooldown:
43+
default-days: 7
3844

3945
# Main master npm frontend dependencies
4046
- package-ecosystem: npm
@@ -47,10 +53,11 @@ updates:
4753
day: saturday
4854
time: "03:00"
4955
timezone: Europe/Paris
50-
open-pull-requests-limit: 20
5156
labels:
5257
- "3. to review"
5358
- "feature: dependencies"
59+
open-pull-requests-limit: 20
60+
versioning-strategy: increase
5461
# Disable automatic rebasing because without a build CI will likely fail anyway
5562
rebase-strategy: "disabled"
5663
cooldown:
@@ -74,7 +81,7 @@ updates:
7481

7582
# Composer dependencies for linting and testing
7683
- package-ecosystem: composer
77-
target-branch: stable34
84+
target-branch: stable35
7885
directories:
7986
- "/"
8087
- "/vendor-bin/behat"
@@ -88,6 +95,8 @@ updates:
8895
day: saturday
8996
time: "03:30"
9097
timezone: Europe/Paris
98+
cooldown:
99+
default-days: 7
91100
labels:
92101
- "3. to review"
93102
- "feature: dependencies"
@@ -98,7 +107,7 @@ updates:
98107

99108
# frontend dependencies
100109
- package-ecosystem: npm
101-
target-branch: stable34
110+
target-branch: stable35
102111
directories:
103112
- "/"
104113
- "/build/frontend"
@@ -111,10 +120,11 @@ updates:
111120
cooldown:
112121
default-days: 4
113122
semver-major-days: 8
114-
open-pull-requests-limit: 20
115123
labels:
116124
- "3. to review"
117125
- "feature: dependencies"
126+
open-pull-requests-limit: 20
127+
versioning-strategy: increase
118128
# Disable automatic rebasing because without a build CI will likely fail anyway
119129
rebase-strategy: "disabled"
120130
groups:
@@ -133,6 +143,58 @@ updates:
133143

134144
# Older stable releases
135145

146+
# Composer dependencies for linting and testing
147+
- package-ecosystem: composer
148+
target-branch: stable34
149+
directories:
150+
- "/"
151+
- "/vendor-bin/behat"
152+
- "/vendor-bin/cs-fixer"
153+
- "/vendor-bin/openapi-extractor"
154+
- "/vendor-bin/phpunit"
155+
- "/vendor-bin/psalm"
156+
schedule:
157+
interval: weekly
158+
day: saturday
159+
time: "04:30"
160+
timezone: Europe/Paris
161+
cooldown:
162+
default-days: 7
163+
labels:
164+
- "3. to review"
165+
- "feature: dependencies"
166+
ignore:
167+
# only patch updates on stable branches
168+
- dependency-name: "*"
169+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
170+
171+
# frontend dependencies
172+
- package-ecosystem: npm
173+
target-branch: stable34
174+
directories:
175+
- "/"
176+
- "/build/frontend"
177+
- "/build/frontend-legacy"
178+
schedule:
179+
interval: weekly
180+
day: saturday
181+
time: "04:30"
182+
timezone: Europe/Paris
183+
cooldown:
184+
default-days: 4
185+
semver-major-days: 8
186+
labels:
187+
- "3. to review"
188+
- "feature: dependencies"
189+
open-pull-requests-limit: 20
190+
versioning-strategy: increase
191+
# Disable automatic rebasing because without a build CI will likely fail anyway
192+
rebase-strategy: "disabled"
193+
ignore:
194+
# no major updates on stable branches
195+
- dependency-name: "*"
196+
update-types: ["version-update:semver-major"]
197+
136198
# Composer dependencies for linting and testing
137199
- package-ecosystem: composer
138200
target-branch: stable33
@@ -148,6 +210,8 @@ updates:
148210
day: saturday
149211
time: "04:30"
150212
timezone: Europe/Paris
213+
cooldown:
214+
default-days: 7
151215
labels:
152216
- "3. to review"
153217
- "feature: dependencies"
@@ -159,7 +223,10 @@ updates:
159223
# frontend dependencies
160224
- package-ecosystem: npm
161225
target-branch: stable33
162-
directory: "/"
226+
directories:
227+
- "/"
228+
- "/build/frontend"
229+
- "/build/frontend-legacy"
163230
schedule:
164231
interval: weekly
165232
day: saturday
@@ -168,10 +235,11 @@ updates:
168235
cooldown:
169236
default-days: 4
170237
semver-major-days: 8
171-
open-pull-requests-limit: 20
172238
labels:
173239
- "3. to review"
174240
- "feature: dependencies"
241+
open-pull-requests-limit: 20
242+
versioning-strategy: increase
175243
# Disable automatic rebasing because without a build CI will likely fail anyway
176244
rebase-strategy: "disabled"
177245
ignore:
@@ -194,6 +262,8 @@ updates:
194262
day: saturday
195263
time: "04:30"
196264
timezone: Europe/Paris
265+
cooldown:
266+
default-days: 7
197267
labels:
198268
- "3. to review"
199269
- "feature: dependencies"

.github/workflows/ai-policy.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ jobs:
3232
- name: Collect PR commit messages
3333
id: collect
3434
env:
35-
GH_TOKEN: ${{ github.token }}
35+
# Fall back to the default token when the PAT is unavailable
36+
# (e.g. Dependabot- or fork-triggered runs don't receive Actions secrets)
37+
GH_TOKEN: ${{ secrets.COMMAND_BOT_PAT || github.token }}
3638
COMMITS_URL: ${{ github.event.pull_request.commits_url }}
3739
run: |
3840
set -euo pipefail
@@ -125,7 +127,9 @@ jobs:
125127
- name: Create 'AI assisted' label if absent
126128
if: steps.ai_trailers.outputs.ai_assisted == 'true' || steps.agent_signoff.outputs.agent_signoff == 'true' || steps.co_authored.outputs.co_authored == 'true'
127129
env:
128-
GH_TOKEN: ${{ github.token }}
130+
# Fall back to the default token when the PAT is unavailable
131+
# (e.g. Dependabot- or fork-triggered runs don't receive Actions secrets)
132+
GH_TOKEN: ${{ secrets.COMMAND_BOT_PAT || github.token }}
129133
run: |
130134
gh api "repos/${{ github.repository }}/labels" \
131135
--method POST \
@@ -137,11 +141,13 @@ jobs:
137141
- name: Label PR as AI assisted
138142
if: steps.ai_trailers.outputs.ai_assisted == 'true' || steps.agent_signoff.outputs.agent_signoff == 'true' || steps.co_authored.outputs.co_authored == 'true'
139143
env:
140-
GH_TOKEN: ${{ github.token }}
144+
# Fall back to the default token when the PAT is unavailable
145+
# (e.g. Dependabot- or fork-triggered runs don't receive Actions secrets)
146+
GH_TOKEN: ${{ secrets.COMMAND_BOT_PAT || github.token }}
141147
run: |
142-
gh pr edit "${{ github.event.pull_request.number }}" \
143-
--repo "${{ github.repository }}" \
144-
--add-label "AI assisted"
148+
gh api "repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/labels" \
149+
--method POST \
150+
-f "labels[]=AI assisted"
145151
echo "Added 'AI assisted' label to PR #${{ github.event.pull_request.number }}"
146152
147153
- name: Fail on coding-agent Signed-off-by

.github/workflows/autocheckers.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
src: ${{ steps.changes.outputs.src }}
2121

2222
steps:
23-
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
23+
- uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
2424
id: changes
2525
continue-on-error: true
2626
with:
@@ -48,13 +48,13 @@ jobs:
4848

4949
steps:
5050
- name: Checkout server
51-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
51+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
5252
with:
5353
persist-credentials: false
5454
submodules: true
5555

5656
- name: Set up php
57-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
57+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 #v2.37.2
5858
timeout-minutes: 5
5959
with:
6060
php-version: '8.3'
@@ -77,13 +77,13 @@ jobs:
7777

7878
steps:
7979
- name: Checkout server
80-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
80+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
8181
with:
8282
persist-credentials: false
8383
submodules: true
8484

8585
- name: Set up php
86-
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
86+
uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 #v2.37.2
8787
timeout-minutes: 5
8888
with:
8989
php-version: '8.3'

.github/workflows/block-merge-freeze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ jobs:
5454

5555
- name: Run check
5656
if: ${{ env.server_ref != '' }}
57-
run: cat version.php | grep 'OC_VersionString' | grep -i -v 'RC'
57+
run: cat version.php | grep 'OC_VersionString' | grep -i -v -E '(\.0\.0 RC[3-9]|\.[1-9][0-9]* RC)'

.github/workflows/block-outdated-3rdparty.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Check requirement
24-
uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
24+
uses: dorny/paths-filter@7b450fff21473bca461d4b92ce414b9d0420d706 # v4.0.2
2525
id: changes
2626
continue-on-error: true
2727
with:
@@ -31,7 +31,7 @@ jobs:
3131
- 'version.php'
3232
3333
- name: Checkout
34-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
34+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3535
with:
3636
persist-credentials: false
3737

.github/workflows/block-unconventional-commits.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
30+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3131
with:
3232
persist-credentials: false
3333

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ jobs:
3232
build-mode: none
3333
steps:
3434
- name: Checkout repository
35-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
35+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
3636
with:
3737
persist-credentials: false
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
40+
uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
4141
with:
4242
languages: ${{ matrix.language }}
4343
build-mode: ${{ matrix.build-mode }}
4444
config-file: ./.github/codeql-config.yml
4545

4646
- name: Perform CodeQL Analysis
47-
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
47+
uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
4848
with:
4949
category: "/language:${{matrix.language}}"

0 commit comments

Comments
 (0)