Source code for the custom Mastodon (Glitchsoc) instance on berserker.town. https://berserker.town/

You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Tag: Branch: Tree: 1fbd1fa5c4

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '1fbd1fa5c4'

${ noResults }

microblog/spec/helpers

History

Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		2 years ago
..
admin	Add ability to filter audit log in admin UI (#13381)	4 years ago
settings	Set up /settings/keyword_mutes. #164.	7 years ago
accounts_helper_spec.rb	Split AccountsHelper from StatusesHelper (#12078)	5 years ago
application_helper_spec.rb	Spelling (#17705)	2 years ago
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	7 years ago
home_helper_spec.rb	Fix locale related specs (#3707)	7 years ago
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	6 years ago
jsonld_helper_spec.rb	Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)	2 years ago
languages_helper_spec.rb	Change languages to be listed under standard instead of native name in admin UI (#17485)	2 years ago
routing_helper_spec.rb	Use URI.join even when S3 enabled (#4652)	7 years ago
statuses_helper_spec.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	3 years ago