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

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
..
chewy	Change algorithm of `tootctl search deploy` to improve performance (#18463)	2 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
mailers	Add mail headers to avoid auto-replies (#23597)	1 year ago
models	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Remove unused InstancePresenter#sample_accounts method (#23900)	1 year ago
serializers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
services	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
views	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago