Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

PCHR-3930: Uninstall HR-Recruitment Extension #532

Merged
merged 5 commits into from
Sep 18, 2018

Conversation

backstageel
Copy link
Contributor

Overview

This PR removes the HR-Recruitment extension and is composed by:
PCHR-4003: Hide Recruitment Menu in Admin Portal
and
PCHR-4004: Removing HR Vacancies From SSP

@davialexandre davialexandre merged commit 5565d23 into staging Sep 18, 2018
@davialexandre davialexandre deleted the PCHR-3930-Hide-the-recruitment-vacancy branch September 18, 2018 12:40
davialexandre added a commit that referenced this pull request Sep 18, 2018
On #532, an upgrader was added to remove
"Vancacies" from the SSP menu. Originally, this upgrader number was 7036. Before this was merged to
staging, another PR (#536) was merged adding
an upgrader with the same number.

This caused a conflict which we tried to fix in 05cd2c6.
When fixing conflicts with upgrader coming from staging, the only correct approach is to change the upgrader in our PR to
a number higher than whatever we have on staging. The reason is that, if we pick a lower number the upgrader will never be executed.
Unfortunately, this is not what happened here. The upgrader was kept with the same name and the number of the one from
staging was increased to 7037.

Finally, #532 was kept open for quite a long time. In the meanwhile,
Another PR (#460) was merged to staging adding an upgrader with the number 7037. This time, git didn't
detect the conflict and after #532 was merged we ended up with two upgraders
with the same number.

To fix this we:
- Reverted the change in 05cd2c6 and renamed the upgrader that removes the old "Help" menu back to 7036
- Renamed the upgrader added by #532 to 7038 (one number higher than the latest we have on staging)
This was referenced Sep 18, 2018
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants