Skip to content

[6.8] Bump jquery from 3.4.1 to 3.5.0 (#64884)#65336

Merged
jportner merged 3 commits intoelastic:6.8from
jportner:backport/6.8/pr-64884
May 5, 2020
Merged

[6.8] Bump jquery from 3.4.1 to 3.5.0 (#64884)#65336
jportner merged 3 commits intoelastic:6.8from
jportner:backport/6.8/pr-64884

Conversation

@jportner
Copy link
Copy Markdown
Contributor

@jportner jportner commented May 5, 2020

Backports the following commits to 6.8:

# Conflicts:
#	packages/kbn-ui-shared-deps/package.json
#	src/plugins/dashboard/public/application/listing/dashboard_listing_ng_wrapper.html
#	src/plugins/visualize/public/application/editor/editor.html
#	x-pack/package.json
#	x-pack/plugins/graph/public/angular/templates/index.html
#	x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
#	x-pack/plugins/maps/public/angular/listing_ng_wrapper.html
#	x-pack/plugins/monitoring/public/directives/main/index.html
#	yarn.lock
@jportner jportner added the backport This PR is a backport of another PR label May 5, 2020
jportner added 2 commits May 5, 2020 14:51
The assertion shouldn't have been failing, but changing it slightly
causes it to pass.
@kibanamachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@jportner jportner merged commit a72b8ce into elastic:6.8 May 5, 2020
@jportner jportner deleted the backport/6.8/pr-64884 branch May 5, 2020 21:10
jportner added a commit to jportner/kibana that referenced this pull request May 12, 2020
jportner added a commit to jportner/kibana that referenced this pull request May 19, 2020
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.

2 participants