Skip to content

[7.x] [Canvas] move files from legacy/plugins to plugins (#65283) (#6…#65769

Merged
crob611 merged 2 commits intoelastic:7.8from
crob611:7.8-move-files
May 8, 2020
Merged

[7.x] [Canvas] move files from legacy/plugins to plugins (#65283) (#6…#65769
crob611 merged 2 commits intoelastic:7.8from
crob611:7.8-move-files

Conversation

@crob611
Copy link
Contributor

@crob611 crob611 commented May 7, 2020

…5406)

Conflicts:

.github/CODEOWNERS

test/scripts/jenkins_xpack.sh

x-pack/legacy/plugins/canvas/index.js

x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts

  • Remove CODEOWNERS that was added by merge conflict

  • Removes some files that were hanging around in legacy/plugins/canvas

Summary

Summarize your PR. If it involves visual changes include a screenshot or gif.

Checklist

Delete any items that are not applicable to this PR.

For maintainers

…) (elastic#65406)

* [Canvas] move files from legacy/plugins to plugins (elastic#65283)

* Moves the files

* Rename legacy/plugins/canvas paths

* Correct paths

* Fix shareable_runtime and storybook

* ESLint Fixes

* Fix jest test and paths
# Conflicts:
#	.github/CODEOWNERS
#	test/scripts/jenkins_xpack.sh
#	x-pack/legacy/plugins/canvas/index.js
#	x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts

* Remove CODEOWNERS that was added by merge conflict

* Removes some files that were hanging around in legacy/plugins/canvas
@crob611 crob611 added the backport This PR is a backport of another PR label May 7, 2020
@crob611
Copy link
Contributor Author

crob611 commented May 7, 2020

@elasticmachine merge upstream

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@crob611 crob611 merged commit 9d69d5d into elastic:7.8 May 8, 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.

3 participants