glitchier-soc/app
Claire 443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
2021-11-25 23:50:35 +01:00
..
chewy Add trending links (#16917) 2021-11-25 13:07:38 +01:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
mailers Add trending links (#16917) 2021-11-25 13:07:38 +01:00
models Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 21:44:57 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
services Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2021-10-14 22:14:26 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00