[Reporting] Clean up orphaned file #71730
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tsullivan
added
release_note:skip
tsullivan
force-pushed
the
reporting/re-delete-file
branch
2 times, most recently
from
d46f49a to
4835fbf
Compare
...that was accidentally recovered due to incorrect manual merge
tsullivan
force-pushed
the
reporting/re-delete-file
branch
from
4835fbf to
4f94cb7
Compare
💚 Build SucceededBuild metrics
History
To update your PR or re-run it, just comment with: |
tsullivan
changed the title
|
Removal of this code was already reviewed in #71031 |
tsullivan
added a commit
to tsullivan/kibana
that referenced
this pull request
Jul 15, 2020
...that was accidentally recovered due to incorrect manual merge
gmmorris
added a commit
to gmmorris/kibana
that referenced
this pull request
Jul 15, 2020
* master: (82 commits) Fixed the spacing of child accordion items for policy response dialog. (elastic#71677) [SECURITY] Timeline bug 7.9 (elastic#71748) use fixed isChromeVisible method (elastic#71813) [SIEM][Detection Engine][Lists] Adds specific endpoint_list REST API and API for abilities to auto-create the endpoint_list if it gets deleted (elastic#71792) [test] Skips flaky Saved Objects Management test [APM] Remove watcher integration (elastic#71655) [APM] Increase `xpack.apm.ui.transactionGroupBucketSize` (elastic#71661) [test] Skips Ingest Manager test preventing ES promotion [test] Skips flaky detection engine tests Revert "re-fix navigate path for master add SAML login to login_page (elastic#71337)" [tests] Temporarily skipped Fleet tests [test] Skipped monitoring test [Security Solution][Detections] Associate Endpoint Exceptions List to Rule during rule creation/update (elastic#71794) Add endpoint exception creation API validation (elastic#71791) Skip jest tests that timeout waiting for react (elastic#71801) [Security Solution][Exceptions] - Adds filtering to endpoint index patterns by exceptional fields (elastic#71757) [Reporting] Re-delete a file (elastic#71730) [Security Solution] [Detections] Fixes bug for determining when we hit max signals after filtering with lists (elastic#71768) [Ingest Manager] Better display of Fleet requirements (elastic#71686) [tests] Temporarily skipped to promote snapshot ...
tsullivan
added a commit
that referenced
this pull request
Jul 16, 2020
...that was accidentally recovered due to incorrect manual merge Co-authored-by: Elastic Machine <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up on this comment: https://github.com/elastic/kibana/pull/67027/files#r454574649
Working in 2 branches got me to manually resolving conflicts between them, and in the process I accidentally refactored code into a separate file in #67027 that was supposed to be deleted per #71031