Skip to content

Conversation

@szaimen
Copy link
Contributor

@szaimen szaimen commented Mar 24, 2022

Fix #27607

Superseds #31484

Signed-off-by: Petre T [email protected]

@szaimen szaimen added this to the Nextcloud 25 milestone Mar 24, 2022
@szaimen szaimen requested review from a team, PVince81, artonge, blizzz, petre2dor and skjnldsv and removed request for a team March 24, 2022 11:19
@szaimen
Copy link
Contributor Author

szaimen commented Mar 24, 2022

/compile amend /

@nextcloud-command nextcloud-command force-pushed the enh/27607/fix-user-count branch from 66154d8 to 2f3256a Compare March 24, 2022 11:26
@petre2dor
Copy link

/compile amend /

@nextcloud-command nextcloud-command force-pushed the enh/27607/fix-user-count branch from d715577 to 855b668 Compare March 24, 2022 20:44
@szaimen szaimen added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 25, 2022
@szaimen szaimen modified the milestones: Nextcloud 25, Nextcloud 24 Mar 25, 2022
@szaimen szaimen requested review from Pytal and artonge and removed request for artonge March 25, 2022 08:50
@petre2dor
Copy link

Can someone here please assist me with fixing the failed checks?

I have no clue how to handle this fail:
image

@szaimen
Copy link
Contributor Author

szaimen commented Mar 28, 2022

/compile amend /

@nextcloud-command nextcloud-command force-pushed the enh/27607/fix-user-count branch from 8784713 to c2908a5 Compare March 28, 2022 16:08
@artonge
Copy link
Contributor

artonge commented Mar 28, 2022

@petre2dor you'll also need to fix DCO: https://github.com/nextcloud/server/pull/31697/checks?check_run_id=5723583117

@petre2dor petre2dor force-pushed the enh/27607/fix-user-count branch from c2908a5 to 89f1530 Compare March 28, 2022 16:46
@Pytal
Copy link
Member

Pytal commented Mar 28, 2022

/compile amend /

@nextcloud-command nextcloud-command force-pushed the enh/27607/fix-user-count branch from 89f1530 to 8046190 Compare March 28, 2022 17:27
@szaimen
Copy link
Contributor Author

szaimen commented Mar 28, 2022

/rebase

@nextcloud-command nextcloud-command force-pushed the enh/27607/fix-user-count branch from 8046190 to 3e2d1dd Compare March 28, 2022 19:55
@petre2dor
Copy link

petre2dor commented Mar 29, 2022

@petre2dor you'll also need to fix DCO: https://github.com/nextcloud/server/pull/31697/checks?check_run_id=5723583117

Hey @artonge,
I fixed the DCO a couple times using the instructions there and it passed, but now I keep getting all kinds of conflicts and after I fixed them I can't do 'git rebase --continue' because there are no changes, so I'm stuck.
Is there a way out of this?

@artonge
Copy link
Contributor

artonge commented Mar 29, 2022

Hey @artonge, I fixed the DCO a couple times using the instructions there and it passed, but now I keep getting all kinds of conflicts and after I fixed them I can't do 'git rebase --continue' because there are no changes, so I'm stuck. Is there a way out of this?

Ok, I am handling it :)

@artonge artonge force-pushed the enh/27607/fix-user-count branch from db9f1eb to 3b25cf7 Compare March 29, 2022 08:57
Signed-off-by: Petre Tudor <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
@artonge artonge force-pushed the enh/27607/fix-user-count branch from 3b25cf7 to ae1a820 Compare March 29, 2022 08:59
@artonge artonge merged commit 93d0c60 into master Mar 29, 2022
@artonge artonge deleted the enh/27607/fix-user-count branch March 29, 2022 11:53
@artonge
Copy link
Contributor

artonge commented Mar 29, 2022

Thanks for the fix @petre2dor !

@blizzz blizzz mentioned this pull request Mar 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Settings - counts of users are not incremented after user add

5 participants