Skip to content
This repository was archived by the owner on Mar 31, 2022. It is now read-only.

Conversation

@Murphydbuffalo
Copy link

@Murphydbuffalo Murphydbuffalo commented Aug 5, 2021

Don't merge this. This PR is just for ease of viewing the diff 👁️

Without potentially disconnecting the parent process's connection.

This diff is taken directly from resque#1739
@Murphydbuffalo Murphydbuffalo changed the base branch from master to custom20 August 5, 2021 16:14
@Alex-Quinn
Copy link

@Murphydbuffalo can this be closed?

@Murphydbuffalo
Copy link
Author

@Alex-Quinn as things currently stand we need to keep this branch because our gemfile points to it: gem 'resque', '2.0.0', git: 'https://github.com/wunderteam/resque.git', branch: 'custom21'

I'm not positive why we point to a branch rather than master, that was the existing pattern at the time I made my change but I'm guessing the thinking is that we want master on our fork to mirror master in the resque repo, so we keep all of our custom behavior on the customXX branches

@Alex-Quinn
Copy link

@Murphydbuffalo FWIW, I agree with you that we shouldn't point our production portal app to a branch. It violates the expected of Github workflow and the norms of our other repos.

Given that we're actively moving to resque master we can probably just leave this as-is though.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants