Skip to content
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

Revert 815d2bd7c612450e2a15a6543c7e74558adf4a81 "[Manual Backport 2.x] Feat (core): Make theme settings user-specific and user-configurable (#5652) (#6681)" #6978

Merged
merged 2 commits into from
Jun 10, 2024

Conversation

seraphjiang
Copy link
Member

This reverts commit 815d2bd on 2.x branch

We are lack of test coverage to release this feature. It should be ok to leave it in main. There is debt whether we should keep in 2.x. Since there is no clear plan for the test, the change is big. To avoid manual revert on every release (like what we did in 2.14), we'd like to revert on 2.x.

Signed-off-by: Huan Jiang <seraphjiang@gmail.com>
Copy link
Contributor

github-actions bot commented Jun 7, 2024

❌ Invalid Changelog Heading

The '## Changelog' heading in your PR description is either missing or malformed. Please make sure that your PR description includes a '## Changelog' heading with proper spelling, capitalization, spacing, and Markdown syntax.

@Flyingliuhub Flyingliuhub added the Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry label Jun 7, 2024
@seraphjiang
Copy link
Member Author

@joshuarrrr @ashwin-pc @ananzh @BionIT
feel free to comment if any question.

Copy link

codecov bot commented Jun 7, 2024

Codecov Report

Attention: Patch coverage is 62.26415% with 20 lines in your changes missing coverage. Please review.

Project coverage is 67.56%. Comparing base (f8d49d5) to head (84f0f20).

Files Patch % Lines
src/core/server/rendering/rendering_service.tsx 29.41% 6 Missing and 6 partials ⚠️
src/legacy/ui/ui_render/ui_render_mixin.js 0.00% 6 Missing ⚠️
src/core/server/rendering/views/theme.ts 77.77% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #6978      +/-   ##
==========================================
+ Coverage   67.49%   67.56%   +0.07%     
==========================================
  Files        3442     3441       -1     
  Lines       67868    67805      -63     
  Branches    11024    11017       -7     
==========================================
+ Hits        45805    45812       +7     
+ Misses      19399    19332      -67     
+ Partials     2664     2661       -3     
Flag Coverage Δ
Linux_1 33.09% <12.50%> (+<0.01%) ⬆️
Linux_2 55.23% <54.16%> (+0.06%) ⬆️
Linux_3 45.21% <22.22%> (+<0.01%) ⬆️
Linux_4 35.03% <17.02%> (+0.04%) ⬆️
Windows_1 33.12% <12.50%> (+<0.01%) ⬆️
Windows_2 55.18% <54.16%> (+0.06%) ⬆️
Windows_3 45.22% <22.22%> (+<0.01%) ⬆️
Windows_4 35.03% <17.02%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@BionIT BionIT merged commit 87d9ee0 into opensearch-project:2.x Jun 10, 2024
66 of 67 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.x
# Create a new branch
git switch --create backport/backport-6978-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 87d9ee080699c4dcdd3783c6276a3e5762f45629
# Push it to GitHub
git push --set-upstream origin backport/backport-6978-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-6978-to-2.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working failed changeset Skip-Changelog PRs that are too trivial to warrant a changelog or release notes entry v2.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants