Skip to content

Commit 7b084c6

Browse files
authored
Merge branch 'nextcloud:master' into fix/csp-header-split-for-large-policies
2 parents ef604a0 + be15904 commit 7b084c6

122 files changed

Lines changed: 1231 additions & 442 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/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: Initialize CodeQL
40-
uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
40+
uses: github/codeql-action/init@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
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@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
47+
uses: github/codeql-action/analyze@7211b7c8077ea37d8641b6271f6a365a22a5fbfa # v4.36.0
4848
with:
4949
category: "/language:${{matrix.language}}"

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

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

5353
# Enable GitHub auto merge
5454
- name: Auto merge
55-
uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
55+
uses: alexwilson/enable-github-automerge-action@2c32e18a76e0726ffe7a573bfff2d42a20885126 # v3.0.0
5656
if: startsWith(steps.branchname.outputs.branch, 'dependabot/')
5757
with:
5858
github-token: ${{ secrets.GITHUB_TOKEN }}

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

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

116116
- name: Upload code coverage
117117
if: ${{ !cancelled() && matrix.coverage }}
118-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
118+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
119119
with:
120120
files: ./clover.xml
121121
flags: phpunit-files-external-ftp

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
117117
- name: Upload code coverage
118118
if: ${{ !cancelled() && matrix.coverage }}
119-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
119+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
120120
with:
121121
files: ./clover.xml
122122
flags: phpunit-files-external-s3
@@ -199,7 +199,7 @@ jobs:
199199
200200
- name: Upload code coverage
201201
if: ${{ !cancelled() && matrix.coverage }}
202-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
202+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
203203
with:
204204
files: ./clover.xml
205205
flags: phpunit-files-external-s3

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

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

104104
- name: Upload code coverage
105105
if: ${{ !cancelled() && matrix.coverage }}
106-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
106+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
107107
with:
108108
files: ./clover.xml
109109
flags: phpunit-files-external-sftp

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

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

118118
- name: Upload code coverage
119119
if: ${{ !cancelled() && matrix.coverage }}
120-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
120+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
121121
with:
122122
files: ./clover.xml
123123
flags: phpunit-files-external-smb

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

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

110110
- name: Upload code coverage
111111
if: ${{ !cancelled() && matrix.coverage }}
112-
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
112+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
113113
with:
114114
files: ./clover.xml
115115
flags: phpunit-files-external-webdav

.github/workflows/files-external.yml

Lines changed: 1 addition & 1 deletion
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@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6.0.0
101+
uses: codecov/codecov-action@e79a6962e0d4c0c17b229090214935d2e33f8354 # v6.0.1
102102
with:
103103
files: ./clover.xml
104104
flags: phpunit-files-external-generic

.github/workflows/integration-dav.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7272

7373
- name: Set up Python
74-
uses: LizardByte/actions/actions/setup_python@4125866b7b655a6fe038b0e22a43a4c5d259af79 # v2026.417.35446
74+
uses: LizardByte/actions/actions/setup_python@25babf9f2e9f088145ba488339c78c4df9394fc7 # v2026.524.145234
7575
with:
7676
python-version: '2.7'
7777

.github/workflows/integration-sqlite.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
- 'openldap_features'
6767
- 'openldap_numerical_features'
6868
- 'ldap_features'
69-
- 'remoteapi_features'
7069
- 'routing_features'
7170
- 'setup_features'
7271
- 'sharees_features'

0 commit comments

Comments
 (0)