Skip to content

Allow to edit admin user - #20381

Merged
MorrisJobke merged 1 commit into
masterfrom
fix/allow_edit_admin_user
Apr 17, 2020
Merged

Allow to edit admin user#20381
MorrisJobke merged 1 commit into
masterfrom
fix/allow_edit_admin_user

Conversation

@GretaD

@GretaDGretaD commented Apr 9, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

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

ref #18818 (review)
fixes#18530

@GretaDGretaD added the 3. to review Waiting for reviews label Apr 9, 2020
@GretaDGretaD added this to the Nextcloud 19 milestone Apr 9, 2020
@rullzerrullzer mentioned this pull request Apr 9, 2020
Merged
59 tasks
@skjnldsv

skjnldsv commented Apr 10, 2020

Copy link
Copy Markdown
Member

/backport to stable18

gary-kim
gary-kim approved these changes Apr 13, 2020
View reviewed changes

@gary-kimgary-kim left a comment

Copy link
Copy Markdown
Member

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

gary-kim commented Apr 13, 2020

Copy link
Copy Markdown
Member

/compile amend /

@npmbuildbot-nextcloud
npmbuildbot-nextcloudBotforce-pushed the fix/allow_edit_admin_user branch from 16aa0e8 to 521bb8aCompareApril 13, 2020 15:22
@gary-kim

gary-kim commented Apr 13, 2020

Copy link
Copy Markdown
Member

Somehow, that made things worse. Whoops

@kesselb
kesselbforce-pushed the fix/allow_edit_admin_user branch 2 times, most recently from 250bd5d to b7d6edbCompareApril 13, 2020 16:18
@kesselb

kesselb commented Apr 13, 2020

Copy link
Copy Markdown
Contributor

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

Fixed that for you.

kesselb
kesselb reviewed Apr 13, 2020
View reviewed changes
Comment threadapps/settings/src/components/UserList/UserRowSimple.vue Outdated
@skjnldsv

skjnldsv commented Apr 14, 2020

Copy link
Copy Markdown
Member

tests not happy

@kesselb
kesselbforce-pushed the fix/allow_edit_admin_user branch from b7d6edb to 74f899bCompareApril 14, 2020 08:50
@kesselb

kesselb commented Apr 14, 2020

Copy link
Copy Markdown
Contributor

tests not happy

master is failing with the same error 🎉

@GretaD

GretaD commented Apr 15, 2020

Copy link
Copy Markdown
ContributorAuthor

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
kesselbforce-pushed the fix/allow_edit_admin_user branch from 74f899b to 262c051CompareApril 15, 2020 10:39
@kesselb

kesselb commented Apr 15, 2020

Copy link
Copy Markdown
Contributor

Rebased the branch.

This was referenced Apr 15, 2020
Merged
Merged
@kesselb
kesselbforce-pushed the fix/allow_edit_admin_user branch from 262c051 to cdf807fCompareApril 16, 2020 09:11
nickvergessen
nickvergessen reviewed Apr 16, 2020
View reviewed changes
Comment threadapps/settings/src/components/UserList/UserRowSimple.vue Outdated
@kesselb
kesselbforce-pushed the fix/allow_edit_admin_user branch 2 times, most recently from 0f35ca5 to 268d406CompareApril 16, 2020 09:51
@GretaD@kesselb
Allow to edit admin user
d17c58e
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the fix/allow_edit_admin_user branch from 268d406 to d17c58eCompareApril 16, 2020 09:59
@GretaD

GretaD commented Apr 16, 2020

Copy link
Copy Markdown
ContributorAuthor

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

@kesselb

kesselb commented Apr 16, 2020

Copy link
Copy Markdown
Contributor

Yes. The failing tests are unrelated to this change.

@GretaDGretaD 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

MorrisJobke commented Apr 17, 2020

Copy link
Copy Markdown
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 masterApr 17, 2020
@MorrisJobke
MorrisJobke deleted the fix/allow_edit_admin_user branch April 17, 2020 07:07
@backportbot-nextcloud

backportbot-nextcloudBot commented Apr 17, 2020

Copy link
Copy Markdown

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

@kesselbkesselb mentioned this pull request Apr 17, 2020
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nickvergessennickvergessennickvergessen left review comments
@kesselbkesselbkesselb left review comments
@skjnldsvskjnldsvskjnldsv approved these changes
@gary-kimgary-kimgary-kim approved these changes
@juliusknorrjuliusknorrAwaiting requested review from juliusknorr
@rullzerrullzerAwaiting requested review from rullzer
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finish

Projects

None yet

Milestone

Nextcloud 19

Development

Successfully merging this pull request may close these issues.

Editing my user via user managment not possible

6 participants

@GretaD@skjnldsv@gary-kim@kesselb@MorrisJobke@nickvergessen