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.

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

remove validate-json to resolve bad merge #34249

Merged
merged 2 commits into from
Apr 1, 2019

Conversation

lizozom
Copy link
Contributor

@lizozom lizozom commented Apr 1, 2019

Summary

In scope of raw json control migration (#32888) @maryia-lapata removed validate-json directive since raw_json.html was the only place where the directive was used. Since #32888 was merged before #33807 it happened that validate-json directive was added again (https://github.com/elastic/kibana/pull/33807/files#diff-43be5582b4bcc45291d35e397fea8fbdR24)

This PR removes validate-json.js

Checklist

Use strikethroughs to remove checklist items you don't feel are applicable to this PR.

- [ ] This was checked for cross-browser compatibility, including a check against IE11
- [ ] Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
!!- [ ] Documentation was added for features that require explanation or tutorials!!

@lizozom lizozom self-assigned this Apr 1, 2019
@lizozom lizozom added regression Team:Visualizations Visualization editors, elastic-charts and infrastructure v8.0.0 v7.2.0 labels Apr 1, 2019
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-app

@lizozom lizozom requested a review from maryia-lapata April 1, 2019 08:30
@elasticmachine
Copy link
Contributor

💔 Build Failed

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Copy link
Contributor

@maryia-lapata maryia-lapata left a comment

Choose a reason for hiding this comment

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

LGTM, thank you

@lizozom lizozom merged commit e934a48 into elastic:master Apr 1, 2019
lizozom added a commit to lizozom/kibana that referenced this pull request Apr 1, 2019
* remove validate-json to resolve bad merge

* Remove import of validate_json
lizozom added a commit that referenced this pull request Apr 1, 2019
* remove validate-json to resolve bad merge

* Remove import of validate_json
@timroes timroes added the chore label Apr 3, 2019
@lizozom lizozom deleted the new-platform-delete-validate-json branch April 21, 2019 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore regression Team:Visualizations Visualization editors, elastic-charts and infrastructure v7.2.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants