Skip to content

Commit 0959836

Browse files
Copilotmiaulalala
Copilot
and
miaulalala
authored
Merge branch 'master' of https://github.com/nextcloud/server into fix/2531/comments-not-marked-read
# Conflicts: # dist/ActivityCommentAction-4Z_gsB_Z.chunk.mjs.license # dist/ActivityCommentAction-4Z_gsB_Z.chunk.mjs.map # dist/ActivityCommentAction-4Z_gsB_Z.chunk.mjs.map.license # dist/ActivityCommentAction-CaBMEWuf.chunk.mjs.license # dist/ActivityCommentAction-CaBMEWuf.chunk.mjs.map # dist/ActivityCommentAction-CaBMEWuf.chunk.mjs.map.license # dist/ActivityCommentAction-CsbmNmci.chunk.mjs # dist/ActivityCommentAction-CsbmNmci.chunk.mjs.license # dist/ActivityCommentAction-CsbmNmci.chunk.mjs.map # dist/ActivityCommentAction-CsbmNmci.chunk.mjs.map.license # dist/ActivityCommentEntry-B_giHO2y.chunk.mjs.license # dist/ActivityCommentEntry-B_giHO2y.chunk.mjs.map # dist/ActivityCommentEntry-B_giHO2y.chunk.mjs.map.license # dist/ActivityCommentEntry-CfTf0_m2.chunk.mjs.license # dist/ActivityCommentEntry-CfTf0_m2.chunk.mjs.map # dist/ActivityCommentEntry-CfTf0_m2.chunk.mjs.map.license # dist/ActivityCommentEntry-CoQEMOeN.chunk.mjs.license # dist/ActivityCommentEntry-CoQEMOeN.chunk.mjs.map # dist/ActivityCommentEntry-CoQEMOeN.chunk.mjs.map.license # dist/CommentView-BviNYZ77.chunk.mjs # dist/CommentView-BviNYZ77.chunk.mjs.license # dist/CommentView-BviNYZ77.chunk.mjs.map # dist/CommentView-BviNYZ77.chunk.mjs.map.license # dist/CommentView-CX3IUGTX.chunk.mjs # dist/CommentView-CX3IUGTX.chunk.mjs.license # dist/CommentView-CX3IUGTX.chunk.mjs.map # dist/CommentView-CX3IUGTX.chunk.mjs.map.license # dist/CommentView-bIFQcpqr.chunk.mjs # dist/CommentView-bIFQcpqr.chunk.mjs.license # dist/CommentView-bIFQcpqr.chunk.mjs.map # dist/CommentView-bIFQcpqr.chunk.mjs.map.license # dist/FilesSidebarTab-BcwJ-H_u.chunk.mjs.license # dist/FilesSidebarTab-BcwJ-H_u.chunk.mjs.map.license # dist/FilesSidebarTab-DFnb_1de.chunk.mjs.license # dist/FilesSidebarTab-DFnb_1de.chunk.mjs.map.license # dist/FilesSidebarTab-DzQL5sEP.chunk.mjs # dist/FilesSidebarTab-DzQL5sEP.chunk.mjs.license # dist/FilesSidebarTab-DzQL5sEP.chunk.mjs.map # dist/FilesSidebarTab-DzQL5sEP.chunk.mjs.map.license # dist/GetComments-B2KQKdVF.chunk.mjs.license # dist/GetComments-B2KQKdVF.chunk.mjs.map # dist/GetComments-B2KQKdVF.chunk.mjs.map.license # dist/GetComments-Di3IqcIJ.chunk.mjs # dist/GetComments-Di3IqcIJ.chunk.mjs.license # dist/GetComments-Di3IqcIJ.chunk.mjs.map # dist/GetComments-Di3IqcIJ.chunk.mjs.map.license # dist/ReadComments-CMOQZLlB.chunk.mjs.license # dist/ReadComments-CMOQZLlB.chunk.mjs.map # dist/ReadComments-CMOQZLlB.chunk.mjs.map.license # dist/comments-comments-app.mjs # dist/comments-comments-tab.mjs Co-authored-by: miaulalala <7427347+miaulalala@users.noreply.github.com>
2 parents a0dd846 + 35484a9 commit 0959836

718 files changed

Lines changed: 4660 additions & 2222 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/ISSUE_TEMPLATE/BUG_REPORT.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ body:
7373
options:
7474
- "32"
7575
- "33"
76-
- "34 (master)"
76+
- "34"
77+
- "35 (master)"
7778
validations:
7879
required: true
7980
- type: dropdown

‎.github/dependabot.yml‎

Lines changed: 48 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ updates:
7474

7575
# Composer dependencies for linting and testing
7676
- package-ecosystem: composer
77-
target-branch: stable33
77+
target-branch: stable34
7878
directories:
7979
- "/"
8080
- "/vendor-bin/behat"
@@ -98,7 +98,7 @@ updates:
9898

9999
# frontend dependencies
100100
- package-ecosystem: npm
101-
target-branch: stable33
101+
target-branch: stable34
102102
directories:
103103
- "/"
104104
- "/build/frontend"
@@ -133,6 +133,52 @@ updates:
133133

134134
# Older stable releases
135135

136+
# Composer dependencies for linting and testing
137+
- package-ecosystem: composer
138+
target-branch: stable33
139+
directories:
140+
- "/"
141+
- "/vendor-bin/behat"
142+
- "/vendor-bin/cs-fixer"
143+
- "/vendor-bin/openapi-extractor"
144+
- "/vendor-bin/phpunit"
145+
- "/vendor-bin/psalm"
146+
schedule:
147+
interval: weekly
148+
day: saturday
149+
time: "04:30"
150+
timezone: Europe/Paris
151+
labels:
152+
- "3. to review"
153+
- "feature: dependencies"
154+
ignore:
155+
# only patch updates on stable branches
156+
- dependency-name: "*"
157+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
158+
159+
# frontend dependencies
160+
- package-ecosystem: npm
161+
target-branch: stable33
162+
directory: "/"
163+
schedule:
164+
interval: weekly
165+
day: saturday
166+
time: "04:30"
167+
timezone: Europe/Paris
168+
cooldown:
169+
default-days: 4
170+
semver-major-days: 8
171+
open-pull-requests-limit: 20
172+
labels:
173+
- "3. to review"
174+
- "feature: dependencies"
175+
# Disable automatic rebasing because without a build CI will likely fail anyway
176+
rebase-strategy: "disabled"
177+
ignore:
178+
# no major updates on stable branches
179+
- dependency-name: "*"
180+
update-types: ["version-update:semver-major"]
181+
136182
# Composer dependencies for linting and testing
137183
- package-ecosystem: composer
138184
target-branch: stable32

‎.github/workflows/autocheckers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
submodules: true
5959

6060
- name: Set up php ${{ matrix.php-versions }}
61-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
61+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
6262
timeout-minutes: 5
6363
with:
6464
php-version: ${{ matrix.php-versions }}
@@ -91,7 +91,7 @@ jobs:
9191
submodules: true
9292

9393
- name: Set up php ${{ matrix.php-versions }}
94-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
94+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
9595
timeout-minutes: 5
9696
with:
9797
php-version: ${{ matrix.php-versions }}

‎.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@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
40+
uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
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@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
47+
uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
4848
with:
4949
category: "/language:${{matrix.language}}"

‎.github/workflows/cypress.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
run: ./node_modules/cypress/bin/cypress install
191191

192192
- name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
193-
uses: cypress-io/github-action@c495c3ddffba403ba11be95fffb67e25203b3799 # v7.1.10
193+
uses: cypress-io/github-action@dace029018fcdf86e0df89a31bc3cfa5b32570d8 # v7.3.0
194194
with:
195195
# We already installed the dependencies in the init job
196196
install: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp:/home/test -v /tmp/ftp:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi
8282
8383
- name: Set up php ${{ matrix.php-versions }}
84-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
84+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
8585
timeout-minutes: 5
8686
with:
8787
php-version: ${{ matrix.php-versions }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
submodules: true
8181

8282
- name: Set up php ${{ matrix.php-versions }}
83-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
83+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
8484
timeout-minutes: 5
8585
with:
8686
php-version: ${{ matrix.php-versions }}
@@ -169,7 +169,7 @@ jobs:
169169
submodules: true
170170

171171
- name: Set up php ${{ matrix.php-versions }}
172-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
172+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
173173
timeout-minutes: 5
174174
with:
175175
php-version: ${{ matrix.php-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
if [[ '${{ matrix.sftpd }}' == 'openssh' ]]; then docker run -p 2222:22 --name sftp -d -v /tmp/sftp:/home/test atmoz/sftp 'test:test:::data'; fi
7878
7979
- name: Set up php ${{ matrix.php-versions }}
80-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
80+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
8181
timeout-minutes: 5
8282
with:
8383
php-version: ${{ matrix.php-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
submodules: true
8282

8383
- name: Set up php ${{ matrix.php-versions }}
84-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
84+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
8585
timeout-minutes: 5
8686
with:
8787
php-version: ${{ matrix.php-versions }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
submodules: true
7777

7878
- name: Set up php ${{ matrix.php-versions }}
79-
uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f #v2.37.0
79+
uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc #v2.37.1
8080
timeout-minutes: 5
8181
with:
8282
php-version: ${{ matrix.php-versions }}

0 commit comments

Comments
 (0)