Skip to content

chore: group dependabot PRs for minor and patch updates #2340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
miaulalala merged 1 commit into from
Feb 2, 2026
+56 −11
Merged

chore: group dependabot PRs for minor and patch updates #2340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 48 additions & 7 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,30 @@
version: 2
updates:
- package-ecosystem: composer
- package-ecosystem: "composer"
directory: "/"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
cooldown:
default-days: 6
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies
- package-ecosystem: composer
- 3. to review
- dependencies
groups:
prod:
dependency-type: "production"
update-types:
- "minor"
- "patch"
dev:
dependency-type: "development"
update-types:
- "minor"
- "patch"
- package-ecosystem: "composer"
directories:
- "/vendor-bin/cs-fixer"
- "/vendor-bin/phpunit"
Expand All @@ -21,23 +34,42 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
cooldown:
default-days: 6
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies
- package-ecosystem: npm
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: weekly
day: saturday
time: "03:00"
timezone: Europe/Paris
cooldown:
default-days: 6
open-pull-requests-limit: 10
# Disable automatic rebasing because without a build CI will likely fail anyway
rebase-strategy: "disabled"
labels:
- 3. to review
- dependencies
- 3. to review
- dependencies
groups:
vue:
patterns:
- "*vue*"
- "*vite*"
prod:
dependency-type: "production"
update-types:
- "minor"
- "patch"
dev:
dependency-type: "development"
update-types:
- "minor"
- "patch"
# GitHub Actions
- package-ecosystem: "github-actions"
directory: ".github/workflows"
Expand All @@ -49,3 +81,12 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Berlin
cooldown:
default-days: 6
labels:
- 3. to review
- github_actions
groups:
github-actions:
patterns:
- "*"
4 changes: 2 additions & 2 deletions cypress/e2e/sidebar.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { createFolder, getFileListRow, moveFile, navigateToFolder, renameFile } from './filesUtils.ts'
import { addComment, addTag, createPublicShare, randHash, showActivityTab, toggleFavorite } from './sidebarUtils.ts'
import { addComment, addTag, closeToasts, createPublicShare, randHash, showActivityTab, toggleFavorite } from './sidebarUtils.ts'

describe('Check activity listing in the sidebar', { testIsolation: true }, () => {
beforeEach(function() {
Expand Down Expand Up @@ -56,8 +56,8 @@ describe('Check activity listing in the sidebar', { testIsolation: true }, () =>
it('Has move activity', () => {
createFolder('Test folder')
moveFile('welcome.txt', 'Test folder')
closeToasts()
navigateToFolder('Test folder')

showActivityTab('welcome.txt')
cy.get('.activity-entry').first().should('contains.text', 'You moved')
})
Expand Down
4 changes: 4 additions & 0 deletions cypress/e2e/sidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ export function closeSidebar() {
.should('not.contain', 'opendetails')
}

export function closeToasts() {
cy.get('button.toast-close').click({ multiple: true })
}

export function showActivityTab(fileName: string) {
cy.intercept('GET', '/ocs/v2.php/apps/activity/api/v2/activity/filter**').as('getActivities')

Expand Down
2 changes: 1 addition & 1 deletion lib/Settings/Admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function getForm(): TemplateResponse {
IExtension::METHOD_NOTIFICATION => $this->l10n->t('Push'),
]);

return new TemplateResponse('activity', 'settings/admin', [], 'blank');
return new TemplateResponse('activity', 'settings/admin', [], TemplateResponse::RENDER_AS_BLANK);
}

#[\Override]
Expand Down
2 changes: 1 addition & 1 deletion lib/Settings/Personal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public function getForm(): TemplateResponse {
'methods' => $methods,

'activity_digest_enabled' => $this->userSettings->getUserSetting($this->userId, 'setting', 'activity_digest')
], 'blank');
], TemplateResponse::RENDER_AS_BLANK);
}

/**
Expand Down
Loading