translate tutorials(apm)#22217
Merged
maryia-lapata merged 9 commits intoelastic:masterfrom Sep 6, 2018
Merged
Conversation
Contributor
💔 Build Failed |
Contributor
💚 Build Succeeded |
|
blocked by #22181 |
Contributor
💚 Build Succeeded |
|
Hi @pavel06081991, we have found your signature in our records, but it seems like you have signed with a different e-mail than the one used in yout Git commit. Can you please add both of these e-mails into your Github profile (they can be hidden), so we can match your e-mails to your Github profile? |
# Conflicts: # src/core_plugins/kibana/server/tutorials/apm/apm_client_instructions.js # src/core_plugins/kibana/server/tutorials/apm/apm_server_instructions.js # src/core_plugins/kibana/server/tutorials/apm/elastic_cloud.js # src/core_plugins/kibana/server/tutorials/apm/index.js # src/core_plugins/kibana/server/tutorials/apm/on_prem.js
pavel06081991
force-pushed
the
feature/tutorial-translations-part7
branch
from
b23f80e to
04ea98f
Compare
Contributor
💚 Build Succeeded |
maryia-lapata
requested review from
LeanidShutau,
maryia-lapata and
tsullivan
and removed request for
maryia-lapata,
tsullivan and
yankouskia
LeanidShutau
approved these changes
Sep 4, 2018
Contributor
LeanidShutau
left a comment
LeanidShutau
left a comment
There was a problem hiding this comment.
LGTM, but old eslint comments should be removed
| defaultMessage: 'Configure the agent', | ||
| }), | ||
| textPre: i18n.translate('kbn.server.tutorials.apm.nodeClient.configure.textPre', { | ||
| // eslint-disable-next-line no-multi-str |
Contributor
There was a problem hiding this comment.
no-multi-str rule is disabled in eslint config
| // eslint-disable-next-line no-multi-str | ||
| defaultMessage: 'Note: If script execution is disabled on your system, \ | ||
| you need to set the execution policy for the current session \ | ||
| to allow the script to run. For example: `PowerShell.exe -ExecutionPolicy UnRestricted -File .\\install-service-apm-server.ps1`.', |
Contributor
There was a problem hiding this comment.
Maybe we should move PowerShell.exe -ExecutionPolicy UnRestricted -File .\\install-service-apm-server.ps1 to the values. What do you think?
Contributor
There was a problem hiding this comment.
It's a good point. Thank you.
Fixed.
Contributor
💔 Build Failed |
Contributor
💚 Build Succeeded |
maryia-lapata
requested review from
tsullivan
and removed request for
tsullivan
Member
|
this has a merge conflict, needs to be updated with master |
Contributor
💔 Build Failed |
Contributor
|
retest |
Contributor
💚 Build Succeeded |
This was referenced Sep 6, 2018
maryia-lapata
pushed a commit
to maryia-lapata/kibana
that referenced
this pull request
Sep 6, 2018
* translate tutorials(apm) * remove tabs from the line beginning * remove id duplicate * Remove disabling no-multi-str rule * Move command to the values
maryia-lapata
added a commit
that referenced
this pull request
Sep 6, 2018
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
#21957
translate tutorials(apm)