tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README
This commit is contained in:
Claire
2023-08-11 22:15:41 +02:00
parent 3378bdb01f 425d77f812
commit 44a5f1b64a
130 changed files with 1818 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/mailer.html.haml
View File

@@ -46,9 +46,9 @@
%p= t 'about.hosted_on', domain: site_hostname
%p
= link_to t('application_mailer.notification_preferences'), settings_preferences_notifications_url
- if defined?(@type)
- if defined?(@unsubscribe_url)
·
= link_to t('application_mailer.unsubscribe'), unsubscribe_url(token: @user.to_sgid(for: 'unsubscribe').to_s, type: @type)
= link_to t('application_mailer.unsubscribe'), @unsubscribe_url
%td.column-cell.text-right
= link_to root_url do
= image_tag full_pack_url('media/images/mailer/logo.png'), alt: 'Mastodon', height: 24