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.

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

admin have no special rights on users' entries #39895

Merged
merged 1 commit into from Sep 5, 2023

Conversation

ArtificialOwl
Copy link
Member

@ArtificialOwl ArtificialOwl commented Aug 15, 2023

remove admin's right to modify users' external filesystem configuration.

@szaimen szaimen added the 3. to review Waiting for reviews label Aug 16, 2023
@szaimen szaimen added this to the Nextcloud 28 milestone Aug 16, 2023
@ArtificialOwl ArtificialOwl force-pushed the fix/noid/revoke-admin-overwrite branch from 680b42e to fb2d29e Compare August 16, 2023 14:31
@ArtificialOwl
Copy link
Member Author

failed test are not related

@ArtificialOwl ArtificialOwl force-pushed the fix/noid/revoke-admin-overwrite branch 3 times, most recently from fd40401 to 40584f1 Compare August 18, 2023 11:13
@ArtificialOwl
Copy link
Member Author

/backport to stable27

@ArtificialOwl
Copy link
Member Author

/backport to stable26

@@ -141,18 +130,13 @@ public function testSaveGlobalCredentialsAsAdminForSelf() {
public function testSaveGlobalCredentialsAsNormalUserForSelf() {
$user = $this->createMock(IUser::class);
$user
->expects($this->exactly(2))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm in favor of just removing these count checks unless the number of times something is called is actually relevant to the test

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! and I thought I was the only one

@ArtificialOwl ArtificialOwl force-pushed the fix/noid/revoke-admin-overwrite branch 3 times, most recently from 2c1db9d to 6607388 Compare August 31, 2023 20:27
@ArtificialOwl ArtificialOwl force-pushed the fix/noid/revoke-admin-overwrite branch from 6607388 to 1275bdf Compare August 31, 2023 21:55
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
@skjnldsv skjnldsv force-pushed the fix/noid/revoke-admin-overwrite branch from 435f475 to e55087b Compare September 1, 2023 18:14
@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 1, 2023
@skjnldsv skjnldsv merged commit 2018c72 into master Sep 5, 2023
46 of 47 checks passed
@skjnldsv skjnldsv deleted the fix/noid/revoke-admin-overwrite branch September 5, 2023 12:52
@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@ArtificialOwl
Copy link
Member Author

/backport to stable25

@AndyScherzinger
Copy link
Member

/backport to stable26

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish feature: external storage
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants