-
Notifications
You must be signed in to change notification settings - Fork 9.4k
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
Backport PR-1895 for Magento 2.1 - Fix relative template references in individual Magento modules #13539
Conversation
Hi @hostep, thanks for this pull request. Could you take a look at the static test failures for me.
|
fc971b7
to
1c1c134
Compare
@dmanners: static test failures are fixed. |
Hi @hostep any chance you could have a look at these conflicting files? |
…-engcom/develop-prs-isolated [EngCom] Fix relative template references in individual Magento modules magento#1895 (cherry picked from commit a434162)
1c1c134
to
2943013
Compare
@dmanners: ok done! Just for information: conflicts where caused by db166c7 I've rebased my branch on top of the latest Let's see how the tests are doing (can't seem to get them working properly at the moment on my local machine). |
Thanks @hostep I have never been able to get this branch behaving how I would like in the tests either. Hopefully I can sort this out now though. |
Hi @hostep as discussed via slack I will close this PR. For me this fix is already in newer versions of Magento and the release line 2.1 will no longer be available for contribution as of Monday the 17th of September. The decision to close 2.1 was made to increase focus on 2.2 and 2.3 release lines. Thanks for your understanding. |
Description
This is a backport of #1895 for Magento 2.1
I started with cherry picking this commit: a434162 (since it contains some extra fixes above the PR referenced above) and fixed a bunch of merge conflicts.
Then ran the new static test introduced in the above commit, which revealed two more files which needed fixing, and fixed those two in a separate commit (curiously enough they were fixed in the initial PR by @davidalger, but were not included in the merge commit from @vrann)
Please be very careful when reviewing this, a lot of files have changed!
I'm not exactly sure about the changes in the
composer.json
files, but since they were included in the commit from @vrann, I also included them.Fixed Issues (if relevant)
...
Contribution checklist