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

Add Mastodon link to server email templates #23309

Merged
merged 8 commits into from
Dec 16, 2024
Merged

Add Mastodon link to server email templates #23309

merged 8 commits into from
Dec 16, 2024

Conversation

jc0b
Copy link
Contributor

@jc0b jc0b commented Oct 28, 2024

  • Adds a link to FleetDM's Mastodon account to emails sent by the FleetDM server
  • Adds a Mastodon SVG image to the repo

@jc0b jc0b requested a review from a team as a code owner October 28, 2024 21:17
Copy link

codecov bot commented Oct 28, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.57%. Comparing base (cc2faac) to head (0b60729).

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #23309   +/-   ##
=======================================
  Coverage   63.57%   63.57%           
=======================================
  Files        1602     1602           
  Lines      151786   151786           
  Branches     3916     3952   +36     
=======================================
  Hits        96498    96498           
+ Misses      47608    47607    -1     
- Partials     7680     7681    +1     
Flag Coverage Δ
frontend 53.76% <ø> (ø)

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.

assets/images/mastodon-logo.svg Outdated Show resolved Hide resolved
@lukeheath
Copy link
Member

@rachaelshaw Looking like this is waiting on feedback from you.

Copy link
Member

@rachaelshaw rachaelshaw left a comment

Choose a reason for hiding this comment

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

(See comments for requested changes)

@lukeheath lukeheath marked this pull request as draft December 12, 2024 01:00
@iansltx iansltx dismissed rachaelshaw’s stale review December 16, 2024 04:28

Image has been swapped to PNG.

@iansltx
Copy link
Member

iansltx commented Dec 16, 2024

Found out as part of #24506 that we actually need to put this logo in website/assets/images/permanent. @jc0b, mind:

  1. Swapping the path noted above
  2. Rebasing this PR to catch up with main (and get thew new mfa.html email template)
  3. Adding the Mastodon link to the new mfa.html email

?

With those changes, we should be good to merge here.

Thanks!

@iansltx
Copy link
Member

iansltx commented Dec 16, 2024

One more thing: please add a changes file (similar to the one I included in the PR I linked in my last comment) to note that the Mastodon link got added. That's non-blocking feedback though; I'll hop in and add it if you don't.

@jc0b
Copy link
Contributor Author

jc0b commented Dec 16, 2024

Ok, this should be done now :)

@iansltx iansltx marked this pull request as ready for review December 16, 2024 23:01
@fleet-release fleet-release requested a review from eashaw December 16, 2024 23:01
Copy link
Member

@iansltx iansltx left a comment

Choose a reason for hiding this comment

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

LGTM; thanks! Will merge this, wait for the image to deploy, then confirm that emails have the logo in them.

@iansltx iansltx added :release Ready to write code. Scheduled in a release. See "Making changes" in handbook. #g-endpoint-ops Endpoint ops product group labels Dec 16, 2024
@iansltx iansltx merged commit 78cab5b into fleetdm:main Dec 16, 2024
3 of 4 checks passed
@iansltx iansltx self-assigned this Dec 16, 2024
@iansltx
Copy link
Member

iansltx commented Dec 17, 2024

It works!

image

@jc0b
Copy link
Contributor Author

jc0b commented Dec 17, 2024 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
#g-endpoint-ops Endpoint ops product group :release Ready to write code. Scheduled in a release. See "Making changes" in handbook.
Development

Successfully merging this pull request may close these issues.

4 participants