Merge pull request #5437 from AntonKhorev/user-status-resource

author Andy Allan <git@gravitystorm.co.uk>

Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)

committer GitHub <noreply@github.com>

Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)
author Andy Allan <git@gravitystorm.co.uk>
Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)
committer GitHub <noreply@github.com>
Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)
diff --cc app/abilities/ability.rb
Simple merge
diff --cc app/views/users/show.html.erb
Simple merge
diff --cc config/routes.rb
Simple merge
author	Andy Allan <git@gravitystorm.co.uk>
	Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)
committer	GitHub <noreply@github.com>
	Fri, 17 Jan 2025 17:55:02 +0000 (17:55 +0000)
		1	2
app/abilities/ability.rb	patch \|	diff1 \|	diff2 \|	blob \| history
app/views/users/show.html.erb	patch \|	diff1 \|	diff2 \|	blob \| history
config/routes.rb	patch \|	diff1 \|	diff2 \|	blob \| history