Skip to content

Commit 12a92a2

Browse files
refucktorrefucktor
authored
Merge branch 'master' into feat/support-aws-session-token
2 parents 6b4c859 + 2ef04bf commit 12a92a2

File tree

3,423 files changed

+46882
-38763
lines changed

Some content is hidden

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

3,423 files changed

+46882
-38763
lines changed

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@ af6de04e9e141466dc229e444ff3f146f4a34765
1515
9836e9b16484582d309c8437ab46d82e34956941
1616
# Automated refactorings
1717
49dd79eabb2b8902559a7a4e8f8fcad54f46b604
18+
# @nextcloud/vue import paths
19+
b06f5ba4c47450f355a8903c1a93ac68e8c6cfc2

‎.github/CODEOWNERS

+36-21
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# Fallback owners for code review - ensure all PRs have someone assigned for review.
2+
# (the last match will used so this is only used if there is no more specific code owner below)
3+
4+
# Backend
5+
# is the first and gets everything to make things easier from matching syntax
6+
* @nextcloud/server-backend
7+
8+
# Frontend
9+
# this will override the backend code owners if needed
10+
/__mocks__ @nextcloud/server-frontend
11+
/__tests__ @nextcloud/server-frontend
12+
/cypress @nextcloud/server-frontend
13+
**/js @nextcloud/server-frontend
14+
**/src @nextcloud/server-frontend
15+
*.js @nextcloud/server-frontend
16+
*.ts @nextcloud/server-frontend
17+
118
# App maintainers
219
/apps/admin_audit/appinfo/info.xml @luka-nextcloud @blizzz
320
/apps/cloud_federation_api/appinfo/info.xml @mejo-
@@ -34,14 +51,14 @@
3451
/apps/workflowengine/appinfo/info.xml @blizzz @juliusknorr
3552

3653
# Frontend expertise
37-
/apps/files/src* @skjnldsv
38-
/apps/files_external/src* @skjnldsv
39-
/apps/files_reminders/src* @skjnldsv
40-
/apps/files_sharing/src/actions* @skjnldsv
41-
/apps/files_trashbin/src* @skjnldsv
54+
/apps/files/src* @skjnldsv @nextcloud/server-frontend
55+
/apps/files_external/src* @skjnldsv @nextcloud/server-frontend
56+
/apps/files_reminders/src* @skjnldsv @nextcloud/server-frontend
57+
/apps/files_sharing/src/actions* @skjnldsv @nextcloud/server-frontend
58+
/apps/files_trashbin/src* @skjnldsv @nextcloud/server-frontend
4259

4360
# Security team
44-
/build/psalm-baseline-security.xml @nickvergessen
61+
/build/psalm-baseline-security.xml @nickvergessen @nextcloud/server-backend
4562
/resources/codesigning @mgallien @miaulalala @nickvergessen
4663
/resources/config/ca-bundle.crt @miaulalala @nickvergessen
4764

@@ -53,28 +70,26 @@
5370

5471
# Limit login to IP
5572
# Watch login routes for https://github.com/nextcloud/limit_login_to_ip
56-
/core/routes.php @Altahrim
73+
/core/routes.php @Altahrim @nextcloud/server-backend
5774

5875
# OpenAPI
59-
openapi*.json @provokateurin
60-
ResponseDefinitions.php @provokateurin
76+
openapi*.json @provokateurin
77+
ResponseDefinitions.php @provokateurin
6178

6279
# Talk team
63-
/lib/private/Comments @nickvergessen
64-
/lib/private/Federation @nickvergessen
65-
/lib/private/Talk @nickvergessen
66-
/lib/public/Comments @nickvergessen
67-
/lib/public/Federation @nickvergessen
68-
/lib/public/OCM @nickvergessen
69-
/lib/public/Talk @nickvergessen
70-
/lib/public/UserStatus @nickvergessen
80+
/lib/private/Comments @nickvergessen @nextcloud/talk-backend
81+
/lib/private/Federation @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
82+
/lib/private/Talk @nickvergessen @nextcloud/talk-backend
83+
/lib/public/Comments @nickvergessen @nextcloud/talk-backend
84+
/lib/public/Federation @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
85+
/lib/public/OCM @nickvergessen @nextcloud/talk-backend @nextcloud/server-backend
86+
/lib/public/Talk @nickvergessen @nextcloud/talk-backend
87+
/lib/public/UserStatus @nickvergessen @nextcloud/talk-backend
7188

7289
# Groupware
7390
/build/integration/dav_features/caldav.feature @st3iny @SebastianKrupinski
7491
/build/integration/dav_features/carddav.feature @st3iny @SebastianKrupinski
7592

7693
# Personal interest
77-
*/Activity/* @nickvergessen
78-
*/Notifications/* @nickvergessen
79-
/lib/private/Profiler @CarlSchwan
80-
/lib/public/Profiler @CarlSchwan
94+
*/Activity/* @nickvergessen @nextcloud/server-backend
95+
*/Notifications/* @nickvergessen @nextcloud/talk-backend

‎.github/workflows/autocheckers.yml

+31-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- 'composer.lock'
3838
- '**.php'
3939
40-
autocheckers:
40+
autoloader:
4141
runs-on: ubuntu-latest
4242

4343
needs: changes
@@ -51,8 +51,9 @@ jobs:
5151

5252
steps:
5353
- name: Checkout server
54-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
54+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5555
with:
56+
persist-credentials: false
5657
submodules: true
5758

5859
- name: Set up php ${{ matrix.php-versions }}
@@ -71,6 +72,32 @@ jobs:
7172
- name: Check auto loaders
7273
run: bash ./build/autoloaderchecker.sh
7374

75+
autocheckers:
76+
runs-on: ubuntu-latest-low
77+
78+
strategy:
79+
matrix:
80+
php-versions: ['8.1']
81+
82+
name: Translation and Files checkers
83+
84+
steps:
85+
- name: Checkout server
86+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
87+
with:
88+
persist-credentials: false
89+
submodules: true
90+
91+
- name: Set up php ${{ matrix.php-versions }}
92+
uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 #v2.32.0
93+
with:
94+
php-version: ${{ matrix.php-versions }}
95+
extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite
96+
coverage: none
97+
ini-file: development
98+
env:
99+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
100+
74101
- name: Check translations are JSON decodeable
75102
run: php ./build/translation-checker.php
76103

@@ -87,12 +114,12 @@ jobs:
87114
permissions:
88115
contents: none
89116
runs-on: ubuntu-latest-low
90-
needs: [changes, autocheckers]
117+
needs: [changes, autoloader, autocheckers]
91118

92119
if: always()
93120

94121
name: autocheckers-summary
95122

96123
steps:
97124
- name: Summary status
98-
run: if ${{ needs.changes.outputs.src != 'false' && needs.autocheckers.result != 'success' }}; then exit 1; fi
125+
run: if ${{ needs.autocheckers.result != 'success' || (needs.changes.outputs.src != 'false' && needs.autoloader.result != 'success') }}; then exit 1; fi

‎.github/workflows/cypress.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ jobs:
121121
run: ./node_modules/cypress/bin/cypress install
122122

123123
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
124-
uses: cypress-io/github-action@7271bed2a170d73c0b08939cd192db51a1c46c50 # v6.7.10
124+
uses: cypress-io/github-action@9c318d4f950c2f0ff2e96fa4dc4279e5706efd8e # v6.7.14
125125
with:
126126
# We already installed the dependencies in the init job
127127
install: false
@@ -143,7 +143,7 @@ jobs:
143143
SPLIT_INDEX: ${{ matrix.containers == 'component' && 0 || matrix.containers }}
144144

145145
- name: Upload snapshots and videos
146-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
146+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
147147
if: always()
148148
with:
149149
name: snapshots_videos_${{ matrix.containers }}
@@ -156,7 +156,7 @@ jobs:
156156
run: docker logs nextcloud-cypress-tests_${{ env.APP_NAME }} > nextcloud.log
157157

158158
- name: Upload NC logs
159-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
159+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
160160
if: failure() && matrix.containers != 'component'
161161
with:
162162
name: nc_logs_${{ matrix.containers }}
@@ -167,7 +167,7 @@ jobs:
167167
run: docker exec nextcloud-cypress-tests_${{ env.APP_NAME }} tar -cvjf - data > data.tar
168168

169169
- name: Upload data dir archive
170-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
170+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
171171
if: failure() && matrix.containers != 'component'
172172
with:
173173
name: nc_data_${{ matrix.containers }}

‎.github/workflows/files-external-ftp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100

101101
- name: Upload code coverage
102102
if: ${{ !cancelled() && matrix.coverage }}
103-
uses: codecov/codecov-action@v5.3.1
103+
uses: codecov/codecov-action@v5.4.0
104104
with:
105105
files: ./clover.xml
106106
flags: phpunit-files-external-ftp

‎.github/workflows/files-external-s3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898

9999
- name: Upload code coverage
100100
if: ${{ !cancelled() && matrix.coverage }}
101-
uses: codecov/codecov-action@v5.3.1
101+
uses: codecov/codecov-action@v5.4.0
102102
with:
103103
files: ./clover.xml
104104
flags: phpunit-files-external-s3
@@ -165,7 +165,7 @@ jobs:
165165

166166
- name: Upload code coverage
167167
if: ${{ !cancelled() && matrix.coverage }}
168-
uses: codecov/codecov-action@v5.3.1
168+
uses: codecov/codecov-action@v5.4.0
169169
with:
170170
files: ./clover.xml
171171
flags: phpunit-files-external-s3

‎.github/workflows/files-external-sftp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989

9090
- name: Upload code coverage
9191
if: ${{ !cancelled() && matrix.coverage }}
92-
uses: codecov/codecov-action@v5.3.1
92+
uses: codecov/codecov-action@v5.4.0
9393
with:
9494
files: ./clover.xml
9595
flags: phpunit-files-external-sftp

‎.github/workflows/files-external-smb.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494

9595
- name: Upload code coverage
9696
if: ${{ !cancelled() && matrix.coverage }}
97-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v4.1.1
97+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v4.1.1
9898
with:
9999
files: ./clover.xml
100100
flags: phpunit-files-external-smb

‎.github/workflows/files-external-webdav.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Upload code coverage
9393
if: ${{ !cancelled() && matrix.coverage }}
94-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v4.1.1
94+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v4.1.1
9595
with:
9696
files: ./clover.xml
9797
flags: phpunit-files-external-webdav

‎.github/workflows/files-external.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
- name: Upload code coverage
8181
if: ${{ !cancelled() && matrix.coverage }}
82-
uses: codecov/codecov-action@v5.3.1
82+
uses: codecov/codecov-action@v5.4.0
8383
with:
8484
files: ./clover.xml
8585
flags: phpunit-files-external-generic

‎.github/workflows/node-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
run: npm run test:coverage --if-present
100100

101101
- name: Collect coverage
102-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v4.3.1
102+
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v4.3.1
103103
with:
104104
files: ./coverage/lcov.info
105105

‎.github/workflows/npm-audit-fix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
- name: Create Pull Request
6868
if: steps.checkout.outcome == 'success'
69-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
69+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
7070
with:
7171
token: ${{ secrets.COMMAND_BOT_PAT }}
7272
commit-message: 'fix(deps): Fix npm audit'

‎.github/workflows/object-storage-azure.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105

106106
- name: Upload code coverage
107107
if: ${{ !cancelled() && matrix.coverage }}
108-
uses: codecov/codecov-action@v5.3.1
108+
uses: codecov/codecov-action@v5.4.0
109109
with:
110110
files: ./clover.xml
111111
flags: phpunit-azure

‎.github/workflows/object-storage-s3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111

112112
- name: Upload code coverage
113113
if: ${{ !cancelled() && matrix.coverage }}
114-
uses: codecov/codecov-action@v5.3.1
114+
uses: codecov/codecov-action@v5.4.0
115115
with:
116116
files: ./clover.xml
117117
flags: phpunit-s3

‎.github/workflows/object-storage-swift.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101

102102
- name: Upload code coverage
103103
if: ${{ !cancelled() && matrix.coverage }}
104-
uses: codecov/codecov-action@v5.3.1
104+
uses: codecov/codecov-action@v5.4.0
105105
with:
106106
files: ./clover.xml
107107
flags: phpunit-swift

‎.github/workflows/performance.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191

9292
- name: Upload profiles
9393
if: always()
94-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08
94+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
9595
with:
9696
name: profiles
9797
path: |

‎.github/workflows/phpunit-mariadb.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Upload db code coverage
126126
if: ${{ !cancelled() && matrix.coverage }}
127-
uses: codecov/codecov-action@v5.3.1
127+
uses: codecov/codecov-action@v5.4.0
128128
with:
129129
files: ./clover.db.xml
130130
flags: phpunit-mariadb

‎.github/workflows/phpunit-memcached.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101

102102
- name: Upload code coverage
103103
if: ${{ !cancelled() && matrix.coverage }}
104-
uses: codecov/codecov-action@v5.3.1
104+
uses: codecov/codecov-action@v5.4.0
105105
with:
106106
files: ./clover.xml
107107
flags: phpunit-memcached

‎.github/workflows/phpunit-mysql-sharding.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159

160160
- name: Upload db code coverage
161161
if: ${{ !cancelled() && matrix.coverage }}
162-
uses: codecov/codecov-action@v5.3.1
162+
uses: codecov/codecov-action@v5.4.0
163163
with:
164164
files: ./clover.db.xml
165165
flags: phpunit-mysql

‎.github/workflows/phpunit-mysql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Upload db code coverage
126126
if: ${{ !cancelled() && matrix.coverage }}
127-
uses: codecov/codecov-action@v5.3.1
127+
uses: codecov/codecov-action@v5.4.0
128128
with:
129129
files: ./clover.db.xml
130130
flags: phpunit-mysql

‎.github/workflows/phpunit-nodb.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106

107107
- name: Upload nodb code coverage
108108
if: ${{ !cancelled() && matrix.coverage }}
109-
uses: codecov/codecov-action@v5.3.1
109+
uses: codecov/codecov-action@v5.4.0
110110
with:
111111
files: ./clover.nodb.xml
112112
flags: phpunit-nodb

‎.github/workflows/phpunit-oci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129

130130
- name: Upload db code coverage
131131
if: ${{ !cancelled() && matrix.coverage }}
132-
uses: codecov/codecov-action@v5.3.1
132+
uses: codecov/codecov-action@v5.4.0
133133
with:
134134
files: ./clover.db.xml
135135
flags: phpunit-oci

‎.github/workflows/phpunit-pgsql.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: Upload db code coverage
121121
if: ${{ !cancelled() && matrix.coverage }}
122-
uses: codecov/codecov-action@v5.3.1
122+
uses: codecov/codecov-action@v5.4.0
123123
with:
124124
files: ./clover.db.xml
125125
flags: phpunit-postgres

‎.github/workflows/phpunit-sqlite.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105

106106
- name: Upload db code coverage
107107
if: ${{ !cancelled() && matrix.coverage }}
108-
uses: codecov/codecov-action@v5.3.1
108+
uses: codecov/codecov-action@v5.4.0
109109
with:
110110
files: ./clover.db.xml
111111
flags: phpunit-sqlite

‎.github/workflows/update-cacert-bundle.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: curl --etag-compare build/ca-bundle-etag.txt --etag-save build/ca-bundle-etag.txt --output resources/config/ca-bundle.crt https://curl.se/ca/cacert.pem
2929

3030
- name: Create Pull Request
31-
uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f
31+
uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284
3232
with:
3333
token: ${{ secrets.COMMAND_BOT_PAT }}
3434
commit-message: 'fix(security): Update CA certificate bundle'

0 commit comments

Comments
 (0)