Skip to content

[backport] PR #6581 to 4.x#6596

Merged
epixa merged 1 commit into4.xfrom
jasper/backport/6581-4.x-issues/6127
Mar 22, 2016
Merged

[backport] PR #6581 to 4.x#6596
epixa merged 1 commit into4.xfrom
jasper/backport/6581-4.x-issues/6127

Conversation

@elastic-jasper
Copy link
Copy Markdown
Contributor

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

@elastic-jasper elastic-jasper added backport This PR is a backport of another PR has conflicts labels Mar 22, 2016
@epixa epixa force-pushed the jasper/backport/6581-4.x-issues/6127 branch from 2a9f2f2 to d803e5b Compare March 22, 2016 19:32
@epixa epixa force-pushed the jasper/backport/6581-4.x-issues/6127 branch from d803e5b to 08e39de Compare March 22, 2016 19:35
[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 epixa force-pushed the jasper/backport/6581-4.x-issues/6127 branch from 08e39de to f8a872e Compare March 22, 2016 19:52
@epixa epixa assigned jbudz and unassigned epixa Mar 22, 2016
@epixa
Copy link
Copy Markdown
Contributor

epixa commented Mar 22, 2016

@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.

@jbudz
Copy link
Copy Markdown
Contributor

jbudz commented Mar 22, 2016

LGTM

@jbudz jbudz assigned epixa and unassigned jbudz Mar 22, 2016
epixa added a commit that referenced this pull request Mar 22, 2016
@epixa epixa merged commit 3ed5902 into 4.x Mar 22, 2016
@epixa epixa deleted the jasper/backport/6581-4.x-issues/6127 branch March 22, 2016 20:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport This PR is a backport of another PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants