diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-23 18:13:12 +0100 |
| commit | 3d25fe042679e7f5b9095983feb22f46e24c3033 (patch) | |
| tree | 18b57e7abf4f3edf55f057efd6eb47da698bf0f6 /app/views | |
| parent | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (diff) | |
| parent | 0db101ede2eb9f8869932135785b0d83cd05560e (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
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.
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin_mailer/new_trending_tags.text.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin_mailer/new_trending_tags.text.erb b/app/views/admin_mailer/new_trending_tags.text.erb index 5051e8a96..9ea31fa7c 100644 --- a/app/views/admin_mailer/new_trending_tags.text.erb +++ b/app/views/admin_mailer/new_trending_tags.text.erb @@ -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') %> |