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

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
This commit is contained in:
Claire
2022-02-23 18:13:12 +01:00
parent 2c8615fbf8 0db101ede2
commit 3d25fe0426
71 changed files with 522 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/admin_mailer/new_trending_tags.text.erb
+1 -1
View File
@@ -13,4 +13,4 @@
<%= t('admin_mailer.new_trending_tags.no_approved_tags') %>
<% end %>
<%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(pending_review: '1') %>
<%= raw t('application_mailer.view')%> <%= admin_trends_tags_url(status: 'pending_review') %>