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/app/views/about

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
..
_domain_blocks.html.haml	Add option to obfuscate domain name in public list of domain blocks (#15355)	3 years ago
_logged_in.html.haml	Redesign /about when already logged in (#17348)	2 years ago
_login.html.haml	Add OMNIAUTH_ONLY environment variable to enforce externa log-in (#17288)	2 years ago
_registration.html.haml	Change autocomplete type of password input box (#17702)	2 years ago
more.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
show.html.haml	Redesign /about when already logged in (#17348)	2 years ago
terms.html.haml	Update /terms and /about/more to use public layout (#8142)	6 years ago