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: 3ef5f62abf

local

main

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3ef5f62abf'

${ noResults }

microblog/app/views/settings

History

Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.		1 year ago
..
aliases	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2 years ago
applications	Setup haml-lint CI with todo config (#23524)	1 year ago
deletes	Fix style for hashes (#20518)	2 years ago
exports	Fix reference to non-existing translation in the exports page. (#15894)	3 years ago
featured_tags	Fix styling of featured tags in light theme (#23252)	1 year ago
flavours	Fix settings/flavours	5 years ago
imports	Add option to overwrite imported data (#9962)	5 years ago
login_activities	Setup haml-lint CI with todo config (#23524)	1 year ago
migration/redirects	Fix style for hashes (#20518)	2 years ago
migrations	Fix style for hashes (#20518)	2 years ago
preferences	Add links to glitch-soc's Crowdin (#2033)	1 year ago
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
shared	2FA controller cleanup (#2296)	7 years ago
two_factor_authentication	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
two_factor_authentication_methods	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago