Skip to content

Commit

Permalink
Unify br tags to <br> (#5399)
Browse files Browse the repository at this point in the history
Co-authored-by: Josef Šimánek <[email protected]>
  • Loading branch information
w-masahiro-ct and simi authored Feb 1, 2025
1 parent f68e145 commit a34d82a
Show file tree
Hide file tree
Showing 32 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The Ruby community's gem host.

## Support

<a href="https://rubycentral.org/"><img src="doc/ruby_central_logo.png" height=110></a><br/>
<a href="https://rubycentral.org/"><img src="doc/ruby_central_logo.png" height=110></a><br>

[RubyGems.org](https://rubygems.org) is managed by [Ruby Central](https://rubycentral.org), a non-profit organization that supports the Ruby community through projects like this one, as well as [RubyConf](https://rubyconf.org), [RailsConf](https://railsconf.org), and [Bundler](https://bundler.io). You can support Ruby Central by attending or [sponsoring]([email protected]) a conference, or by [joining as a supporting member](https://rubycentral.org/#/portal/signup).

Expand Down
2 changes: 1 addition & 1 deletion app/views/mailer/admin_manual.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
<%= simple_format @body %><br />
<%= simple_format @body %><br>
</div>

<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="35" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>
Expand Down
6 changes: 3 additions & 3 deletions app/views/mailer/api_key_created.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<% end %>
<br>
</p>
<br/>
<br>
<% if @api_key.name == "legacy-key" %>
<p>
Note that we are in the process of migration from a single API key per account to multiple API keys with minimum scopes enabled.
Expand All @@ -37,10 +37,10 @@
new <strong>POST /api/v1/api_key</strong> endpoint (<%= link_to("Read more", "https://guides.rubygems.org/api-key-scopes/", target: :_blank) %>).
</p>

<br/>
<br>
Please feel free to <%= mail_to("[email protected]", "contact us") %> if something feels amiss.
<% else %>
<br/>
<br>
<p>If this key creation is expected, you do not need to take further action.
<strong>Only if this is unexpected</strong> please take immediate steps to secure your account and gems:
</p>
Expand Down
4 changes: 2 additions & 2 deletions app/views/mailer/api_key_revoked.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
</p>
<p>
Name: <strong><%= @api_key_name %></strong>
<br />
<br>
Scope: <strong><%= @enabled_scopes %></strong>
</p>
<br/>
<br>
<p>
This API key was <a href="<%= @commit_url %>">detected in a public repository</a> by GitHub Secret Scanning. As a result we consider it compromised and have automatically revoked it to prevent any unauthorized access to your account.
</p>
Expand Down
2 changes: 1 addition & 1 deletion app/views/mailer/deletion_complete.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
<%= t('.body_html', sign_up: link_to(t('sign_up'), sign_up_url), host: Gemcutter::HOST_DISPLAY) %><br />
<%= t('.body_html', sign_up: link_to(t('sign_up'), sign_up_url), host: Gemcutter::HOST_DISPLAY) %><br>
</div>

<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="30" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>
Expand Down
2 changes: 1 addition & 1 deletion app/views/mailer/deletion_failed.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
<%= t('.body_html', contact: link_to('contact', "mailto:[email protected]"), host: Gemcutter::HOST_DISPLAY) %><br />
<%= t('.body_html', contact: link_to('contact', "mailto:[email protected]"), host: Gemcutter::HOST_DISPLAY) %><br>
</div>

<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="30" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>
Expand Down
4 changes: 2 additions & 2 deletions app/views/mailer/email_confirmation.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</table>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">Hi <%= @user.handle %>. Welcome to rubygems&#65279.org!<br /> Please click on the button below to verify your email.</div>
<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">Hi <%= @user.handle %>. Welcome to rubygems&#65279.org!<br> Please click on the button below to verify your email.</div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="30" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<!-- Button -->
Expand Down Expand Up @@ -76,7 +76,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
<%= t('mailer.link_expiration_explanation_html') %><br />
<%= t('mailer.link_expiration_explanation_html') %><br>
</div>

<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="35" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>
Expand Down
4 changes: 2 additions & 2 deletions app/views/mailer/email_reset.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
<%= t('.visit_link_instructions', host: Gemcutter::HOST_DISPLAY) %><br />
<%= t('.visit_link_instructions', host: Gemcutter::HOST_DISPLAY) %><br>
</div>

<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="30" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>
Expand Down Expand Up @@ -45,7 +45,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="40" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>

<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
<%= t('mailer.link_expiration_explanation_html') %><br />
<%= t('mailer.link_expiration_explanation_html') %><br>
</div>

<table width="100%" border="0" cellspacing="0" cellpadding="0" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%"><tr><td height="35" class="spacer" style="font-size:0pt; line-height:0pt; text-align:center; width:100%; min-width:100%">&nbsp;</td></tr></table>
Expand Down
2 changes: 1 addition & 1 deletion app/views/mailer/email_reset_update.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<p>
New email address: <strong><%= @user.unconfirmed_email %></strong>
</p>
<br/>
<br>
<p>If this email update is expected, you do not need to take further action.</p>
<p>
<strong>Only if this email update is unexpected</strong>
Expand Down
8 changes: 4 additions & 4 deletions app/views/mailer/gem_pushed.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</p>
<p>
Gem: <strong><%= link_to @version.to_title, rubygem_version_url(@version.rubygem.slug, @version.slug), target: "_blank" %></strong>
<br/>
<br>
<% if @pushed_by_user %>
<% if @pushed_by_user.is_a?(User) %>
Pushed by user:
Expand All @@ -27,13 +27,13 @@
<%= link_to @pushed_by_user.name, rubygem_trusted_publishers_url(@version.rubygem.slug), target: "_blank" %>
</strong>
<% end %>
<br/>
<br>
<% else %>
<strong>Unknown</strong><br/>
<strong>Unknown</strong><br>
<% end %>
Pushed at: <strong><%= @version.created_at.to_formatted_s(:rfc822) %></strong>
</p>
<br/>
<br>
<p>If this push is expected, you do not need to take further action.</p>
<p>
<strong>Only if this push is unexpected</strong>
Expand Down
8 changes: 4 additions & 4 deletions app/views/mailer/gem_trusted_publisher_added.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
</p>
<p>
Gem: <strong><%= link_to @rubygem_trusted_publisher.rubygem.name, rubygem_url(@rubygem_trusted_publisher.rubygem.slug), target: "_blank" %></strong>
<br/>
<br>
Trusted publisher: <strong><%= link_to @rubygem_trusted_publisher.trusted_publisher.name, rubygem_trusted_publishers_url(@rubygem_trusted_publisher.rubygem.slug), target: "_blank" %></strong>
<br/>
<br>
Added by:
<strong>
<%= link_to @created_by_user.display_handle, profile_url(@created_by_user.display_id), target: "_blank" %> <%= mail_to(@created_by_user.email) if @created_by_user.public_email? %>
</strong>
<br/>
<br>
Added at: <strong><%= @rubygem_trusted_publisher.created_at.to_formatted_s(:rfc822) %></strong>
</p>
<br/>
<br>
<p>If this new trusted publisher is expected, you do not need to take further action.</p>
<p>
<strong>Only if this change is unexpected</strong>
Expand Down
6 changes: 3 additions & 3 deletions app/views/mailer/gem_yanked.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
</p>
<p>
Gem: <strong><%= link_to @version.to_title, rubygem_version_url(@version.rubygem.slug, @version.slug), target: "_blank" %></strong>
<br/>
<br>
Yanked by user:
<strong>
<%= link_to @yanked_by_user.handle, profile_url(@yanked_by_user.display_id), target: "_blank" %> <%= mail_to(@yanked_by_user.email) if @yanked_by_user.public_email? %>
</strong>
<br/>
<br>
Yanked at: <strong><%= @version.yanked_at.to_formatted_s(:rfc822) %></strong>
</p>
<br/>
<br>
<p>If this yank is expected, you do not need to take further action.</p>
<p>
<strong>Only if this yank is unexpected</strong>
Expand Down
4 changes: 2 additions & 2 deletions app/views/mailer/mfa_notification.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<div class="h3-1-center" style="color:#1e1e1e; font-family:Georgia, serif; min-width:auto !important; font-size:20px; line-height:26px; text-align:center">
We care about keeping your RubyGems.org account secure and recommend enabling multi-factor authentication for <b>both UI and API</b>.
Setting up multi-factor authentication (MFA) only takes a few minutes and goes a long way towards protecting your account and the Ruby ecosystem.
<br/>
<br>
Once enabled, we will ask you for an OTP for actions like <b>sign in</b> and <b>gem push</b>.
<br/>
<br>
Please click on the Enable Multi-factor Authentication (MFA) button below to register a new device. You may be asked to first log in to your account. You can also find the same link on your <%= link_to("Edit Profile", edit_profile_url(host: Gemcutter::HOST)) %> page.
</div>

Expand Down
16 changes: 8 additions & 8 deletions app/views/mailer/mfa_recommendation_announcement.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
Recently, we've announced our security-focused ambitions to the community.
Attacks on the software supply chain are increasing and the second most common attack is account takeovers.
</p>
<br/>
<br>

<p>
On August 15, 2022, we will begin requiring maintainers of packages with more than 180 million downloads to have multi-factor authentication (MFA) enabled.
Expand All @@ -24,47 +24,47 @@
Furthermore, we are officially recommending that maintainers of packages with more than 165 million downloads enable MFA.
This recommendation will also be shown by the gem CLI.
</p>
<br/>
<br>

<% if @user.mfa_disabled? %>
<p>
We're notifying you of this policy because you maintain at least one gem that has more than 165 million downloads.
So, we'd like to ask you to <b>please enable multi-factor authentication on your RubyGems account 🙏.</b>
</p>
<br/>
<br>

<p>
We recommend setting the
<a href="https://guides.rubygems.org/setting-up-multifactor-authentication/#authentication-levels" target="_blank">MFA level</a>
to <b><i>UI and API</i></b>. However, <b><i>UI and gem signin</i></b> is acceptable too.
</p>
<br />
<br>
<% elsif @user.mfa_ui_only? %>
<p>
We're notifying you of this policy because you maintain at least one gem that has more than 165 million downloads.
Fortunately, you've already taken the first step! But, there's opportunity to improve.
<b>Please upgrade your RubyGems account to a stronger MFA level 🙏.</b>
</p>
<br/>
<br>

<p>
We recommend setting the
<a href="https://guides.rubygems.org/setting-up-multifactor-authentication/#authentication-levels" target="_blank">MFA level</a>
to <b><i>UI and API</i></b>. However, <b><i>UI and gem signin</i></b> is acceptable too.
</p>
<br />
<br>
<% else %>
<p>
We're notifying you of this policy because you maintain at least one gem that has more than 165 million downloads.
Fortunately, you've already enabled MFA. Kudos to you 🥳 🙌!
</p>
<br/>
<br>
<% end %>

<p>
For more information, check out our <a href="https://blog.rubygems.org/2022/06/13/making-packages-more-secure.html" target="_blank">announcement</a>.
</p>
<br/>
<br>

<p>Thank you for making the RubyGems ecosystem more secure.</p>
</div>
Expand Down
16 changes: 8 additions & 8 deletions app/views/mailer/mfa_required_popular_gems_announcement.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,44 +14,44 @@
<p>
Effective today, multi-factor authentication (MFA) is required on your RubyGems account.
</p>
<br/>
<br>

<% if @user.mfa_disabled? %>
<p>
A number of operations are now restricted until you enable MFA.
These restrictions include editing profile pages on the web, signing in on the command line, and performing <a href="https://guides.rubygems.org/mfa-requirement-opt-in/#privileged-operations" target="_blank">privileged actions</a> (ie. push, yank, add/remove owners).
</p>
<br/>
<br>

<p>
<p>
To re-enable these operations for your account, <b>please enable multi-factor authentication 🙏.</b>
</p>
<br/>
<br>
<% elsif @user.mfa_ui_only? %>
<p>
Your current MFA level is no longer recommended. In fact, it's deprecated.
<b>You need to upgrade your RubyGems account to a stronger MFA level 🙏.</b>
</p>
<br/>
<br>

<p>
We recommend setting the
<a href="https://guides.rubygems.org/setting-up-multifactor-authentication/#authentication-levels" target="_blank">MFA level</a>
to <b><i>UI and API</i></b>. However, <b><i>UI and gem signin</i></b> is acceptable too.
</p>
<br/>
<br>

<p>
A number of operations are restricted until you upgrade your MFA setting.
These restrictions include editing profile pages on the web, signing in on the command line, and performing <a href="https://guides.rubygems.org/mfa-requirement-opt-in/#privileged-operations" target="_blank">privileged actions</a> (ie. push, yank, add/remove owners).
</p>
<br/>
<br>
<% end %>

<p>
For more information, check out our <a href="https://blog.rubygems.org/2022/08/15/requiring-mfa-on-popular-gems.html" target="_blank">announcement</a>.
</p>
<br/>
<br>

<p>Thank you for making the RubyGems ecosystem more secure.</p>
</div>
Expand Down
Loading

0 comments on commit a34d82a

Please sign in to comment.