-
Notifications
You must be signed in to change notification settings - Fork 86
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
Reduce code conflicts #589
Conversation
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Codecov Report
@@ Coverage Diff @@
## main #589 +/- ##
==========================================
- Coverage 59.70% 59.67% -0.04%
==========================================
Files 268 268
Lines 8863 8863
Branches 1616 1618 +2
==========================================
- Hits 5292 5289 -3
- Misses 3177 3180 +3
Partials 394 394
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
* Item count in Content panel Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Constants Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Datastream security message Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Unify the refresh Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snapshot Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit 74c0da1)
* Item count in Content panel Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Constants Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Datastream security message Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Unify the refresh Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snapshot Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit 74c0da1)
* Item count in Content panel Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Constants Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Datastream security message Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Unify the refresh Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snapshot Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit 74c0da1) Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
* Item count in Content panel Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Constants Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Datastream security message Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Unify the refresh Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snapshot Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> (cherry picked from commit 74c0da1) Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-589-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 74c0da1a0f0cb450a212109fbdee8374469b3dce
# Push it to GitHub
git push --set-upstream origin backport/backport-589-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3 Then, create a pull request where the |
* Item count in Content panel * Constants * Datastream security message * Unify the refresh * Update test snapshot * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
* Reduce code conflicts (#589) * Item count in Content panel * Constants * Datastream security message * Unify the refresh * Update test snapshot * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snap Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix cypress workflow Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
* Reduce code conflicts (opensearch-project#589) * Item count in Content panel * Constants * Datastream security message * Unify the refresh * Update test snapshot * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snap Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix cypress workflow Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
* Reduce code conflicts (opensearch-project#589) * Item count in Content panel * Constants * Datastream security message * Unify the refresh * Update test snapshot * Update cypress test Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Update test snap Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> * Fix cypress workflow Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com> Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Description
Reduce the code conflict with the internal code base
Files with difference:
Item count
Policy difference, Page title difference
Indices, Managed indicex, Policy page auto refresh is removed
page render diff
Datastream security fix
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.