Feature/dynamic dependencies fix merge conflicts #3400
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
…-data-type' into fe/feature/RI-4989-refactor-json-data-type
covers express js dependency bump
…r-json_update #RI-4989 - refactor json type
* revert resource to Intel for circleci macos job
* revert resource to Intel for circleci macos job
#RI-5574 - fix opening object values fix work with big length json
#RI-5667 - No scrollbar when editing long value
#RI-5568 - fix editing null value
…r-json-data-type Fe/feature/ri 4989 refactor json data type
…y each subsequent character
…demo-data add telemetry events for default data upload
Update README.md
# Conflicts: # tests/e2e/yarn.lock # yarn.lock
…-demo-data enhance demo data
…ersion Bump protobuf version
#RI-5654 - update links
…alerts-2024-04 RI-5597: Fix Dependabot alerts
…tree_view_sorting #RI-5698 - Change the sorting logic of the keys in the list to sort b…
Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](mde/ejs@v3.1.9...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
…-provider enhance provider
…s-3.1.10 Bump ejs from 3.1.9 to 3.1.10
|
arthosofteq seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
kyle-marcum
reviewed
May 21, 2024
| @@ -249,8 +248,7 @@ describe('DatabaseService', () => { | |||
| port: 6380, | |||
| password: 'password', | |||
| connectionType: 'STANDALONE', | |||
| provider: 'LOCALHOST', | |||
| new: false, | |||
| new: false, | |||
kyle-marcum
approved these changes
May 21, 2024
nelsonwellsredis
merged commit f37e9ee
into
feature/dynamic-dependencies
0 of 2 checks passed
nelsonwellsredis
deleted the
feature/dynamic-dependencies-fix-merge-conflicts
branch
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.
No description provided.