cat aescling's git repositories - mastodon.git/commit

]> cat aescling's git repositories - mastodon.git/commit

cat aescling's git repositories / mastodon.git / commit

author	Claire <claire.github-309c@sitedethib.com>
	Thu, 25 Nov 2021 22:49:17 +0000 (23:49 +0100)
committer	Claire <claire.github-309c@sitedethib.com>
	Thu, 25 Nov 2021 22:50:35 +0000 (23:50 +0100)
commit	443ec4f8ba3d9f78acc1b89e2b29ad364cd5e956
tree	6c83fa75cc4f699503546be0a68409fffa11080f	tree \| snapshot
parent	8c2fe2a846dd14914f7faa4bf71be21058249a93	commit \| diff
parent	b1fd6d44901a13450d22884b02eb6e9ae4fc1248	commit \| diff

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`

12 files changed:

source code fur Kibicat Mastodon

RSS Atom

app/lib/activitypub/activity/create.rb	diff1 \|	diff2 \|	blob \| history
app/services/post_status_service.rb	diff1 \|	diff2 \|	blob \| history
app/services/reblog_service.rb	diff1 \|	diff2 \|	blob \| history
app/views/admin/dashboard/index.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/tags/show.html.haml	diff1 \|	diff2 \|	blob \| history
app/views/admin/trends/links/index.html.haml	\|	diff2 \|	blob \| history
app/views/admin/trends/links/preview_card_providers/index.html.haml	\|	diff2 \|	blob \| history
app/views/admin/trends/tags/index.html.haml	\|	diff2 \|	blob \| history
config/navigation.rb	diff1 \|	diff2 \|	blob \| history
config/routes.rb	diff1 \|	diff2 \|	blob \| history
db/schema.rb	diff1 \|	diff2 \|	blob \| history
spec/services/notify_service_spec.rb	diff1 \|	diff2 \|	blob \| history