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

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

Merged
merged 1 commit into from
Jan 24, 2018
Merged

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

merged 1 commit into from
Jan 24, 2018

Conversation

blizzz
Copy link
Member

@blizzz blizzz commented Jan 23, 2018

Backport of #7292

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

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

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

@MorrisJobke
Copy link
Member

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

Correct - let's wait for 12.0.6

@MorrisJobke MorrisJobke mentioned this pull request Jan 23, 2018
Closed
michag86
michag86 approved these changes Jan 23, 2018
View reviewed changes
Copy link
Contributor

@michag86 michag86 left a comment

Choose a reason for hiding this comment

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

works for me 👍

@MorrisJobke
Copy link
Member

@blizzz Sign-off missing ;)

@MorrisJobke MorrisJobke 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
Copy link

codecov bot commented Jan 23, 2018

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 Files Coverage Δ Complexity Δ
settings/Controller/UsersController.php 68.5% <33.33%> (ø) 116 <0> (+2) ⬆️
core/js/js.js 61.94% <0%> (+0.11%) 0% <0%> (ø) ⬇️
apps/files_trashbin/lib/Trashbin.php 72.53% <0%> (+0.24%) 136% <0%> (ø) ⬇️
lib/private/Files/Cache/Propagator.php 96.2% <0%> (+1.26%) 16% <0%> (ø) ⬇️

@blizzz
Copy link
Member Author

blizzz commented Jan 23, 2018

@MorrisJobke Sacré bleu! Fixed.

@MorrisJobke
Copy link
Member

12.0.5 is out -> merge

@MorrisJobke MorrisJobke merged commit f8da92d into stable12 Jan 24, 2018
@MorrisJobke MorrisJobke deleted the stable12-7292 branch January 24, 2018 13:19
@MorrisJobke
Copy link
Member

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

@michag86
Copy link
Contributor

michag86 commented Feb 5, 2018

@MorrisJobke Thank you!

@MorrisJobke MorrisJobke mentioned this pull request Mar 9, 2018
Merged
2 tasks
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

@michag86 michag86 michag86 approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@danxuliu danxuliu Awaiting requested review from danxuliu

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug feature: 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