Skip to content

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Oct 10, 2022

  • ⚠️ This backport had conflicts and is incomplete

backport of #1278

@backportbot-nextcloud backportbot-nextcloud bot added the feature: albums Related to the albums section label Oct 10, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 25 milestone Oct 10, 2022
@artonge
Copy link
Collaborator

artonge commented Oct 10, 2022

/compile /

@blizzz blizzz mentioned this pull request Oct 10, 2022
2 tasks
@skjnldsv
Copy link
Member

Do we have to wait for next 25 version?

@artonge
Copy link
Collaborator

artonge commented Oct 11, 2022

Do we have to wait for next 25 version?

Yes, I think the change is too big for a RC

Copy link
Member

@skjnldsv skjnldsv left a comment

Choose a reason for hiding this comment

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

Blocking until 25.1.0

@artonge artonge self-assigned this Oct 11, 2022
@blizzz blizzz modified the milestones: Nextcloud 25, Nextcloud 25.0.1 Oct 11, 2022
@blizzz
Copy link
Member

blizzz commented Oct 11, 2022

Blocking until 25.1.0

adjusted the milestone 🚩

@blizzz blizzz added the 3. to review Waiting for reviews label Oct 11, 2022
This was referenced Oct 14, 2022
Copy link
Collaborator

@artonge artonge left a comment

Choose a reason for hiding this comment

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

Will need stable25 versions of the following after merging:

@skjnldsv
Copy link
Member

So we can merge now @artonge ?

Signed-off-by: Louis Chemineau <[email protected]>
As there is nothing to separate for public album

Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
This reverts commit 2de383f.

Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
Signed-off-by: Louis Chemineau <[email protected]>
@artonge artonge force-pushed the backport/1278/stable25 branch from e8c034e to 0e8cc37 Compare October 20, 2022 10:15
@artonge artonge enabled auto-merge October 20, 2022 10:15
@artonge artonge dismissed their stale review October 20, 2022 11:47

This is blocking the merge

@artonge artonge merged commit fb6b132 into stable25 Oct 20, 2022
@artonge artonge deleted the backport/1278/stable25 branch October 20, 2022 11:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews feature: albums Related to the albums section

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants