Skip to content

[stable16] Fix tracking of auto disabled apps in Updater - #16753

Merged
rullzer merged 1 commit into
nextcloud:stable16from
kyrofa:backport_16/15416/update_autodisabled_apps
Sep 4, 2019
Merged

[stable16] Fix tracking of auto disabled apps in Updater#16753
rullzer merged 1 commit into
nextcloud:stable16from
kyrofa:backport_16/15416/update_autodisabled_apps

Conversation

@kyrofa

@kyrofakyrofa commented Aug 15, 2019

Copy link
Copy Markdown
Member

This is a backport of #16507 (fixing #15416) for stable16. There were some conflicts, so the automatic backport failed.

This is a backport of nextcloud#16507 (fixing nextcloud#15416) for stable16.
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
@kyrofa

Copy link
Copy Markdown
MemberAuthor

@georgehrke does this look right to you?

@kyrofa

Copy link
Copy Markdown
MemberAuthor

The drone errors appear unrelated.

@kyrofa

Copy link
Copy Markdown
MemberAuthor

@nickvergessen and @MorrisJobke you were both involved in that PR as well, mind taking a quick look at this one?

@nickvergessen

Copy link
Copy Markdown
Member

Which conflicts were involved? are there other backports missing?

@kyrofa

kyrofa commented Aug 20, 2019

Copy link
Copy Markdown
MemberAuthor

Which conflicts were involved?

No big ones, the API was just different between versions is all so it wasn't a clean cherry pick. There should be no behavioral changes.

are there other backports missing?

Not of which I'm aware.

@violoncelloCH

Copy link
Copy Markdown
Member

looks like the backport to stable15 failed as well...

@kyrofa

Copy link
Copy Markdown
MemberAuthor

Indeed, probably for similar reasons.

@nickvergessen

Copy link
Copy Markdown
Member

/backport to stable15

@kyrofa

Copy link
Copy Markdown
MemberAuthor

Hey folks, any progress here?

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

Code make sense :)

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

🐘

@rullzer
rullzer merged commit cf2af05 into nextcloud:stable16Sep 4, 2019
@backportbot-nextcloud

Copy link
Copy Markdown

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

@kyrofa
kyrofa deleted the backport_16/15416/update_autodisabled_apps branch September 4, 2019 17:36
@rullzerrullzer mentioned this pull request Sep 12, 2019
4 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviewsbughigh

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@kyrofa@nickvergessen@violoncelloCH@skjnldsv@rullzer@MorrisJobke@kesselb@georgehrke