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

Allow to edit admin user #20381

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Allow to edit admin user #20381

merged 1 commit into from
Apr 17, 2020

Conversation

GretaD
Copy link
Contributor

@GretaD GretaD commented Apr 9, 2020

Looks like after rebase of #18818 there were some reverted lines. This pr fixes that.

ref #18818 (review)
fixes #18530

@GretaD GretaD requested review from kesselb and juliusknorr April 9, 2020 10:44
@GretaD GretaD added the 3. to review Waiting for reviews label Apr 9, 2020
@GretaD GretaD added this to the Nextcloud 19 milestone Apr 9, 2020
@rullzer rullzer mentioned this pull request Apr 9, 2020
59 tasks
@skjnldsv
Copy link
Member

/backport to stable18

Copy link
Member

@gary-kim gary-kim left a comment

Choose a reason for hiding this comment

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

You seem to have some dev compiled files in here :)

@gary-kim
Copy link
Member

/compile amend /

@npmbuildbot-nextcloud npmbuildbot-nextcloud bot force-pushed the fix/allow_edit_admin_user branch from 16aa0e8 to 521bb8a Compare April 13, 2020 15:22
@gary-kim
Copy link
Member

Somehow, that made things worse. Whoops

@kesselb kesselb force-pushed the fix/allow_edit_admin_user branch 2 times, most recently from 250bd5d to b7d6edb Compare April 13, 2020 16:18
@kesselb
Copy link
Contributor

kesselb commented Apr 13, 2020

You seem to have some dev compiled files in here :)

Fixed that for you.

@skjnldsv
Copy link
Member

tests not happy

@kesselb kesselb force-pushed the fix/allow_edit_admin_user branch from b7d6edb to 74f899b Compare April 14, 2020 08:50
@kesselb
Copy link
Contributor

kesselb commented Apr 14, 2020

tests not happy

master is failing with the same error 🎉

@GretaD
Copy link
Contributor Author

GretaD commented Apr 15, 2020

tests not happy

master is failing with the same error

will check asap to fix the test, but if someone wants to take over, i will be same happy :)

@kesselb kesselb force-pushed the fix/allow_edit_admin_user branch from 74f899b to 262c051 Compare April 15, 2020 10:39
@kesselb
Copy link
Contributor

kesselb commented Apr 15, 2020

Rebased the branch.

This was referenced Apr 15, 2020
@kesselb kesselb force-pushed the fix/allow_edit_admin_user branch from 262c051 to cdf807f Compare April 16, 2020 09:11
@kesselb kesselb force-pushed the fix/allow_edit_admin_user branch 2 times, most recently from 0f35ca5 to 268d406 Compare April 16, 2020 09:51
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb kesselb force-pushed the fix/allow_edit_admin_user branch from 268d406 to d17c58e Compare April 16, 2020 09:59
@GretaD
Copy link
Contributor Author

GretaD commented Apr 16, 2020

wait, since the test is broken on master, we can merge this for now and fix test in another time?

@kesselb
Copy link
Contributor

kesselb commented Apr 16, 2020

Yes. The failing tests are unrelated to this change.

@GretaD GretaD added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Apr 16, 2020
@MorrisJobke
Copy link
Member

Yes. The failing tests are unrelated to this change.

Taking this as granted, I will merge it :P

@MorrisJobke MorrisJobke merged commit 9bd9c2b into master Apr 17, 2020
@MorrisJobke MorrisJobke deleted the fix/allow_edit_admin_user branch April 17, 2020 07:07
@backportbot-nextcloud
Copy link

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

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Editing my user via user managment not possible
6 participants