[backport] PR #6581 to 4.x #6596
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
epixa
force-pushed
the
jasper/backport/6581-4.x-issues/6127
branch
from
2a9f2f2 to
d803e5b
Compare
epixa
force-pushed
the
jasper/backport/6581-4.x-issues/6127
branch
from
d803e5b to
08e39de
Compare
[Commit 1] short url: ensure absolute path isn't persisted Original sha: a8c1305 Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-18T20:02:53Z Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T15:57:16Z [Commit 2] [short url] use url.format when creating /goto link Original sha: 2a71673 Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T14:09:04Z Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T15:57:16Z [Commit 3] [short url] Add tests for query strings, no hashes Original sha: 690a140 Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T14:42:10Z Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T15:57:16Z [Commit 4] [short url] Cleanup Original sha: 49d297f Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T15:09:35Z Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T15:57:16Z [Commit 5] [short url] Add server tests Original sha: a612a0e Authored by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T15:30:12Z Committed by Jonathan Budzenski <jbudz@users.noreply.github.com> on 2016-03-21T18:12:25Z
epixa
force-pushed
the
jasper/backport/6581-4.x-issues/6127
branch
from
08e39de to
f8a872e
Compare
|
@jbudz Since this had conflicts, can you give this a once over before I merge it? No need to look at the 4.5 and 4.5.0, since they had the same conflicts. |
|
LGTM |
epixa
added a commit
that referenced
this pull request
Mar 22, 2016
…/6127 [backport] PR #6581 to 4.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport PR #6581 to 4.x
[Commit 1]
short url: ensure absolute path isn't persisted
[Commit 2]
[short url] use url.format when creating /goto link
[Commit 3]
[short url] Add tests for query strings, no hashes
[Commit 4]
[short url] Cleanup
[Commit 5]
[short url] Add server tests