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

[8.2] [data view mgmt] Field conflict modal - restore functionality (#132197) #132239

Merged
merged 2 commits into from
May 18, 2022
Merged

[8.2] [data view mgmt] Field conflict modal - restore functionality (#132197) #132239

merged 2 commits into from
May 18, 2022

Conversation

mattkime
Copy link
Contributor

Backport

This will backport the following commits from main to 8.2:

Questions ?

Please refer to the Backport tool documentation

@mattkime
[data view mgmt] Field conflict modal - restore functionality (elasti…
bb5aa8b 
…c#132197)

* fix conflicted fields modal

* fix mock

(cherry picked from commit 61ae132)

# Conflicts:
#	src/plugins/data_view_management/public/types.ts
@mattkime mattkime enabled auto-merge (squash) May 16, 2022 12:40
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

Async chunks

Total size of all lazy-loaded chunks that will be downloaded as the user navigates the app

id before after diff
dataViewManagement 123.9KB 123.9KB +8.0B

History

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

@mattkime mattkime merged commit 7ede480 into elastic:8.2 May 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mattkime @kibana-ci