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

Fix EZP-26963: IO Url prefix not working with a host #1907

Merged
merged 2 commits into from Mar 31, 2017

Conversation

@lolautruche
Copy link
Contributor

commented Feb 8, 2017

https://jira.ez.no/browse/EZP-26963

This patch makes it possible to define an url_prefix with a host
as documented.

@lolautruche

This comment has been minimized.

Copy link
Contributor Author

commented Feb 8, 2017

@lolautruche lolautruche force-pushed the lolautruche:fix/urlPrefixWithHost branch from e48b28f to 2a721b3 Feb 8, 2017

@yannickroger yannickroger requested review from bdunogier, glye and andrerom Mar 9, 2017

@andrerom
Copy link
Member

left a comment

+1, but might want to adjust target branch to 6.7 on merge.

@glye
glye approved these changes Mar 9, 2017
@lolautruche

This comment has been minimized.

Copy link
Contributor Author

commented Mar 9, 2017

@andrerom As long as it is backported to 5.4, I'm fine with it 😉
Should I do it?

@andrerom

This comment has been minimized.

Copy link
Member

commented Mar 10, 2017

Should I do it?

pretty please :) (aka: yes if you can that would be great, and we'll take care about the 5.4 merge, make sure to mention that and change base on the other(s) as well)

@lolautruche lolautruche changed the base branch from 6.1 to 6.7 Mar 10, 2017

@lolautruche

This comment has been minimized.

Copy link
Contributor Author

commented Mar 10, 2017

Done here

@lolautruche

This comment has been minimized.

Copy link
Contributor Author

commented Mar 10, 2017

OK Should be fine now. You might need to restart Travis.

@yannickroger

This comment has been minimized.

Copy link
Contributor

commented Mar 13, 2017

@lolautruche could you, if you have time, also base your branch on 6.7. QA now tests pull request before merging so it need an up to date and relevant branch.

If you don't have time, I'll just open another PR in order to have that.

@yannickroger yannickroger self-assigned this Mar 13, 2017

@lolautruche lolautruche force-pushed the lolautruche:fix/urlPrefixWithHost branch from 2a721b3 to 91c9d4e Mar 13, 2017

@lolautruche

This comment has been minimized.

Copy link
Contributor Author

commented Mar 13, 2017

@bdunogier
Copy link
Member

left a comment

Looks good, thank you !

@bdunogier

This comment has been minimized.

Copy link
Member

commented Mar 30, 2017

Well, except for the conflict of course... :)

Fixed the conflict from github, I'll wait for Travis to pass.

@bdunogier bdunogier merged commit 1bb2fd0 into ezsystems:6.7 Mar 31, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
ezrobot/phpcsfixer Code review by ezrobot
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.