Fix conflict between timelion.ui.enabled yml setting and timelion feature control #35266
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
lukeelmers
added
Feature:Timelion
|
Pinging @elastic/kibana-security |
|
This PR raised some related questions about the relationship between feature controls and the timelion app's yml config toggle - more on that in #35267 |
💔 Build Failed |
|
Sorry for clobbering your changes with our Feature Controls merge. |
|
If we do want to proceed with #35267 (comment) we can override |
lukeelmers
force-pushed
the
fix/timelion-ui
branch
from
f12f9a3 to
e407a13
Compare
💚 Build Succeeded |
lukeelmers
force-pushed
the
fix/timelion-ui
branch
from
e407a13 to
d9b6fc5
Compare
💚 Build Succeeded |
|
@kobelb I think this is ready for final review -- I updated the CI config per your suggestion |
kobelb
approved these changes
Apr 29, 2019
lukeelmers
force-pushed
the
fix/timelion-ui
branch
from
d9b6fc5 to
8d39313
Compare
💚 Build Succeeded |
lukeelmers
added a commit
to lukeelmers/kibana
that referenced
this pull request
Apr 29, 2019
…ture control (elastic#35266) * Merge duplicate injectDefaultVars in timelion plugin definition. * Enable timelion app in x-pack functional tests.
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.
When Feature Controls were merged in #31652 (and backported in #35014), the
timelion.ui.enabledyml config introduced in #30131 stopped working. This was due to a duplicateinjectDefaultVarsmethod in the plugin definition.This PR merges the two so that both timelion feature controls and the
timelion.ui.enabledsetting can work correctly.