Skip to content

[stable12] Fix #4789: Group admins cannot see disabled users - #8006

Merged
MorrisJobke merged 1 commit into
stable12from
stable12-7292
Jan 24, 2018
Merged

[stable12] Fix #4789: Group admins cannot see disabled users#8006
MorrisJobke merged 1 commit into
stable12from
stable12-7292

Conversation

@blizzz

@blizzzblizzz commented Jan 23, 2018

Copy link
Copy Markdown
Member

Backport of #7292

I place it to 12.0.6 since .5 is almost out of the door.

@blizzzblizzz added this to the Nextcloud 12.0.6 milestone Jan 23, 2018
@blizzzblizzz mentioned this pull request Jan 23, 2018
Merged
MorrisJobke
MorrisJobke approved these changes Jan 23, 2018
View reviewed changes

@MorrisJobkeMorrisJobke 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.

Tested and works 👍

@MorrisJobke

MorrisJobke commented Jan 23, 2018

Copy link
Copy Markdown
Member

I place it to 12.0.6 since .5 is almost out of the door.

Correct - let's wait for 12.0.6

@MorrisJobkeMorrisJobke mentioned this pull request Jan 23, 2018
Closed
michag86
michag86 approved these changes Jan 23, 2018
View reviewed changes

@michag86michag86 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

works for me 👍

@MorrisJobke

MorrisJobke commented Jan 23, 2018

Copy link
Copy Markdown
Member

@blizzz Sign-off missing ;)

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jan 23, 2018
@Neraste@blizzz
Fix#4789: Group admins cannot see disabled users
308891f
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@codecov

codecovBot commented Jan 23, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8006 into stable12 will increase coverage by <.01%.
The diff coverage is 33.33%.

@@ Coverage Diff @@## stable12 #8006 +/- ##
==============================================
+ Coverage 53.84% 53.84% +<.01% - Complexity 22758 22760 +2 
==============================================
Files 1385 1385 Lines 87148 87148 Branches 1331 1331 ==============================================
+ Hits 46925 46928 +3 + Misses 40223 40220 -3
Impacted FilesCoverage ΔComplexity Δ
settings/Controller/UsersController.php68.5% <33.33%> (ø)116 <0> (+2)⬆️
core/js/js.js61.94% <0%> (+0.11%)0% <0%> (ø)⬇️
apps/files_trashbin/lib/Trashbin.php72.53% <0%> (+0.24%)136% <0%> (ø)⬇️
lib/private/Files/Cache/Propagator.php96.2% <0%> (+1.26%)16% <0%> (ø)⬇️

@blizzz

blizzz commented Jan 23, 2018

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke Sacré bleu! Fixed.

@MorrisJobke

MorrisJobke commented Jan 24, 2018

Copy link
Copy Markdown
Member

12.0.5 is out -> merge

@MorrisJobke
MorrisJobke merged commit f8da92d into stable12Jan 24, 2018
@MorrisJobke
MorrisJobke deleted the stable12-7292 branch January 24, 2018 13:19
@MorrisJobke

MorrisJobke commented Jan 24, 2018

Copy link
Copy Markdown
Member

@michag86 To give you a rough ETA for 12.0.6: we aim for mid march

@michag86

michag86 commented Feb 5, 2018

Copy link
Copy Markdown
Contributor

@MorrisJobke Thank you!

@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
Merged
2 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@michag86michag86michag86 approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen
@danxuliudanxuliuAwaiting requested review from danxuliu

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: users and groups

Projects

None yet

Milestone

Nextcloud 12.0.6

Development

Successfully merging this pull request may close these issues.

4 participants

@blizzz@MorrisJobke@michag86@Neraste