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.

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

Fixes #25606 - fixed URL in discovery mailer #465

Merged
merged 1 commit into from
Dec 3, 2018

Conversation

lzap
Copy link
Member

@lzap lzap commented Dec 3, 2018

Tests were passing because we were only testing for the presence of the base URL, which is at the end of the mail anyway. This now creates new discovered host and perform the test correctly. FYI you can't use _path helpers in mails, links must be all absolute (via _url helpers).

@theforeman-bot
Copy link
Member

Issues: #25606

@lzap
Copy link
Member Author

lzap commented Dec 3, 2018

@rahulbajaj0509 hey after this is merged, we need this to be in Foreman 1.20. Do you want to create stable branch in git and cherry pick this patch for 14.0.1? Basically all you need to do is to checkout label 14.0.0, create new branch called 14-stable and cherry pick this patch into it, then push. Let's wait with releasing 14.0.1 for now we will likely have more bugs.

@rabajaj0509
Copy link
Member

@lzap change looks good :) merging now! Thanks Lukas.

@rabajaj0509 rabajaj0509 merged commit 50695c2 into theforeman:develop Dec 3, 2018
@rabajaj0509
Copy link
Member

@lzap hey i am not able to see the 14.0.0 label created, if I am correct I need to create that label and then create a new branch 14-stable. How to relate the two? how do we decide when to release?

@lzap lzap deleted the mailer-url-25606 branch December 14, 2018 12:42
@lzap
Copy link
Member Author

lzap commented Dec 14, 2018

Sorry my bad, I forgot to push the latest tag. Now it's there and you can proceed creating new branch and cherry picking this one. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants