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

NAS-132330 / 25.04-BETA.1 / Update TrueNAS Brand (by denysbutenko) #11478

Merged
merged 3 commits into from
Feb 4, 2025

Conversation

bugclerk
Copy link
Contributor

@bugclerk bugclerk commented Feb 4, 2025

Automatic cherry-pick failed. Please resolve conflicts by running:

git cherry-pick -x 1008c98338c56494632fe998ccf965b777d7b35b
git cherry-pick -x bfc01918ce5fff950284c69c4a57ad906c5dccc4
git cherry-pick -x dfa0defb93a4caedd0d173f5d96666f76574357a
git cherry-pick -x 40639387e180ed57b0584ffe3dec442a8f65d277
git cherry-pick -x 9356005ce85106f3ee9352a6a5bd1de9f69352f3
git cherry-pick -x 332355fae1f8de86ca0f8d1d8dde5697aef91b1e
git cherry-pick -x b3318bf5e6b0c93bd8e7632dacaac4828a95c2d4
git cherry-pick -x d8e9f8bf135c078f0c4d3bcdcc7e051d02bc11fd
git cherry-pick -x b431cb5834b08aed513a47c46c76cea7e9dc679e
git cherry-pick -x 4f536aa9f91556e40d253361aaebaed1769a8a20
git cherry-pick -x d569c7d17d30c21d58c3b3810476c7f680bec3dd
git cherry-pick -x 0796f050df7b83f48c1a1ed2ad92e33cfa643438
git cherry-pick -x fc8f5843c944093d904b4ae24d273ad48f6633c7
git cherry-pick -x b3ed571fc21697eaa4ae9b3d5a47d52e103dd1d1
git cherry-pick -x 29b86be757781a28844a3ead14b3a2d8c1892165
git cherry-pick -x b12e38e28ee2fd096fcbeee63538d9d477e536d2
git cherry-pick -x a7b5d4375c7f18c3a135ef8baaf50c795a42fe0a

If the original PR was merged via a squash, you can just cherry-pick the squashed commit:

git reset --hard HEAD~1
git cherry-pick -x 921ef500b3d031b4e3cabcc25b52dd4a80c39b5b

Changes:

  • Updated svg files related for TrueNAS logo
  • Used TrueNAS Community Edition for SCALE
  • Used TrueNAS Enterprise for SCALE Enterprise
  • Added ix-truenas-logo component
  • Updated favicons

Testing:

Check affected places for regressions on desktop and mobile.

Downstream

Affects Reasoning
Documentation New branding, all screenshots needs to be updated

Original PR: #11318
Jira URL: https://ixsystems.atlassian.net/browse/NAS-132330

* NAS-133354: QA iSCSI pages

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

* NAS-132330: Update TrueNAS Brand

(cherry picked from commit 921ef50)
@denysbutenko denysbutenko force-pushed the NAS-132330-25.04-BETA.1 branch from 6059b75 to 35e482c Compare February 4, 2025 14:08
@denysbutenko denysbutenko marked this pull request as ready for review February 4, 2025 14:09
@denysbutenko denysbutenko requested a review from a team as a code owner February 4, 2025 14:09
@denysbutenko denysbutenko requested review from undsoft and removed request for a team February 4, 2025 14:09
Copy link
Member

@denysbutenko denysbutenko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

backported

Copy link

codecov bot commented Feb 4, 2025

Codecov Report

Attention: Patch coverage is 95.00000% with 3 lines in your changes missing coverage. Please review.

Please upload report for BASE (release/25.04-BETA.1@1cfde35). Learn more about missing BASE report.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...ules/layout/admin-layout/admin-layout.component.ts 0.00% 2 Missing ⚠️
...yout/topbar/truenas-logo/truenas-logo.component.ts 97.77% 1 Missing ⚠️
Additional details and impacted files
@@                   Coverage Diff                   @@
##             release/25.04-BETA.1   #11478   +/-   ##
=======================================================
  Coverage                        ?   82.88%           
=======================================================
  Files                           ?     1642           
  Lines                           ?    58582           
  Branches                        ?     6181           
=======================================================
  Hits                            ?    48557           
  Misses                          ?    10025           
  Partials                        ?        0           

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

@denysbutenko
Copy link
Member

no permission for merging

@undsoft undsoft merged commit 3bf48e4 into release/25.04-BETA.1 Feb 4, 2025
11 checks passed
@undsoft undsoft deleted the NAS-132330-25.04-BETA.1 branch February 4, 2025 16:00
@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 4, 2025

JIRA ticket https://ixsystems.atlassian.net/browse/NAS-132330 is targeted to the following versions which have not received their corresponding PRs: 25.10

@bugclerk
Copy link
Contributor Author

bugclerk commented Feb 4, 2025

This PR has been merged and conversations have been locked.
If you would like to discuss more about this issue please use our forums or raise a Jira ticket.

@truenas truenas locked as resolved and limited conversation to collaborators Feb 4, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants