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

Backport changes to Octopus #1018

Merged
merged 1 commit into from Apr 5, 2020
Merged

Backport changes to Octopus #1018

merged 1 commit into from Apr 5, 2020

Conversation

heyhippari
Copy link
Contributor

Changes

Backports the tag and path changes for Octopus to 10.5.z

Issues

@heyhippari
Copy link
Contributor Author

@JustAMan Anything that needs to be added aside from tag and paths?

JustAMan
JustAMan reviewed Apr 4, 2020
View reviewed changes
package.json Outdated Show resolved Hide resolved
@JustAMan
Copy link
Contributor

JustAMan commented Apr 4, 2020

@JustAMan Anything that needs to be added aside from tag and paths?

I think all is fine as long as it applies cleanly along with #1005 being cherry-picked here

@JustAMan JustAMan added this to In progress in Release 10.5.3 via automation Apr 4, 2020
@heyhippari
Copy link
Contributor Author

@JustAMan Anything that needs to be added aside from tag and paths?

I think all is fine as long as it applies cleanly along with #1005 being cherry-picked here

I removed the change to package.json, since it'll conflict with #1005. This should be good to go, then.

@JustAMan
Copy link
Contributor

JustAMan commented Apr 4, 2020

@joshuaboniface note that this PR being merged requires #1005 to be backported, too, and vice versa.

@JustAMan JustAMan requested a review from a team April 4, 2020 21:20
@joshuaboniface joshuaboniface added the stable backport Backport into the next stable release label Apr 5, 2020
@joshuaboniface joshuaboniface merged commit f832206 into jellyfin:release-10.5.z Apr 5, 2020
Release 10.5.3 automation moved this from In progress to Done Apr 5, 2020
@joshuaboniface joshuaboniface moved this from Done to Jellyfinished in Release 10.5.3 Apr 5, 2020
@joshuaboniface joshuaboniface removed the stable backport Backport into the next stable release label Apr 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JustAMan JustAMan JustAMan approved these changes

@joshuaboniface joshuaboniface joshuaboniface approved these changes

@dkanada dkanada Awaiting requested review from dkanada

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Release 10.5.3
Jellyfinished
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@heyhippari @JustAMan @joshuaboniface