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.

Sign up for GitHub

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

Jump to bottom

[7.x] [Composable template] Demo and PR review fixes (#71065) #71331

Merged
merged 4 commits into from
Jul 13, 2020
Merged

[7.x] [Composable template] Demo and PR review fixes (#71065) #71331

merged 4 commits into from
Jul 13, 2020

Conversation

alisonelizabeth
Copy link
Contributor

Backports the following commits to 7.x:

@sebelga @alisonelizabeth
[Composable template] Demo and PR review fixes (elastic#71065)
8434daf 
# Conflicts:
#	x-pack/plugins/index_management/public/application/components/mappings_editor/mappings_state.tsx
@alisonelizabeth alisonelizabeth requested a review from sebelga July 10, 2020 00:08
@alisonelizabeth
Copy link
Contributor Author

@sebelga if you don't mind reviewing the changes made to mappings_state.tsx and confirm everything is still working as expected in 7.x. I followed the instructions in #55804 and everything appears OK when using custom types.

@cjcenizal
Copy link
Contributor

Once this is merged we'll need to backport #71353

sebelga
sebelga approved these changes Jul 13, 2020
View reviewed changes
Copy link
Contributor

@sebelga sebelga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thanks for backporting it and fixing the conflicts. 👍

@alisonelizabeth
Copy link
Contributor Author

I'm not sure how CI passed on the original PR to master. There were some unused translations that were not removed, which I fixed via 66bbca2.

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

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

@alisonelizabeth alisonelizabeth merged commit 6c51ba8 into elastic:7.x Jul 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sebelga sebelga sebelga approved these changes

Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@alisonelizabeth @cjcenizal @kibanamachine @sebelga