Skip to content
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

Jump to bottom

[stable18] allow admin to configure the max trashbin size #21976

Merged
merged 1 commit into from
Jul 29, 2020
Merged

[stable18] allow admin to configure the max trashbin size #21976

merged 1 commit into from
Jul 29, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Jul 23, 2020 •
edited
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #21658

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 18.0.8 milestone Jul 23, 2020
@icewind1991
allow admin to configure the max trashbin size
63a90aa 
this allows an admin to configure the max trashbin size instead of always relying on the users quota.

The trashbin size can be configured using the `occ trash:size` command and can be set both globally and per-user

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
Copy link
Member

resolved conflicts

@faily-bot
Copy link

faily-bot bot commented Jul 24, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 31085: failure

jsunit

Show full log 
PhantomJS 2.1.1 (Linux 0.0.0) LOG: 'JQMIGRATE: Migrate is installed, version 1.4.1'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Sidebar initialized'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'Proxying an event bus of version 1.1.2 with 0.2.1'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'Proxying an event bus of version 1.1.2 with 0.2.1'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Sharing.ShareSearch initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Sharing.ExternalLinkActions initialized'
PhantomJS 2.1.1 (Linux 0.0.0): Executed 847 of 851 (skipped 4) SUCCESS (11.615 secs / 10.754 secs)

mariadb10.4-php7.3

  • cancelled - typically means that the tests took longer than the drone CI allows them to run

@MorrisJobke MorrisJobke merged commit 4030402 into stable18 Jul 29, 2020
@MorrisJobke MorrisJobke deleted the backport/21658/stable18 branch July 29, 2020 12:21
@rullzer rullzer mentioned this pull request Aug 13, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@rullzer rullzer rullzer approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Nextcloud 18.0.8
Development

Successfully merging this pull request may close these issues.
3 participants
@icewind1991 @rullzer @MorrisJobke