mastodon

Commit Graph

Author	SHA1	Message	Date
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
Claire	6a0ed45aa3	Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstream Merge upstream changes	1 year ago
Nick Schonning	75131e7bf7	Setup haml-lint CI with todo config (#23524 )	1 year ago
Claire	a232a1feb8	Fix misleading error code when receiving invalid WebAuthn credentials (#23568 )	1 year ago
Claire	cf50667e26	Fix incorrect post links in strikes when the account is remote (#23611 )	1 year ago
Claire	9875be09fe	Fix dashboard crash on ElasticSearch server error (#23751 )	1 year ago
Nick Schonning	15fdd94e2f	Update PostCSS dependencies (#23835 )	1 year ago
Matt Jankowski	a471e1c48f	Add spec for the CLI `version` task (#23978 )	1 year ago
CSDUMMI	39c7236649	Redirect users to SLO at the IdP after logging them out of Mastodon. (#24020 )	1 year ago
Claire	1d0ad558ff	Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call (#24034 )	1 year ago
Nick Schonning	ed887271f3	Skip Docker CI Login/Push on forks (#23564 )	1 year ago
Renaud Chaput	50d39c275d	Push Docker images to Github Container Registry as well (#24101 )	1 year ago
dependabot[bot]	f4f3e2b46e	Bump rubocop from 1.48.0 to 1.48.1 (#24095 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	5b39d20804	Bump rails from 6.1.7.2 to 6.1.7.3 (#24096 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	82d7b08fcf	Bump rack from 2.2.6.3 to 2.2.6.4 (#24097 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
CSDUMMI	5dee40b5f5	Support the PROXY protocol through the PROXY_PROTO_V1 env variable (#24064 )	1 year ago
dependabot[bot]	43ec9d24f9	Bump pghero from 3.2.0 to 3.3.0 (#24085 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	245f0aead2	Bump jsdom from 21.1.0 to 21.1.1 (#24090 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
CSDUMMI	d258ec8e3b	Prefer the stored location as after_sign_in_path in Omniauth Callback Controller (#24073 )	1 year ago
Nick Schonning	e762a14c0a	Enable Rubocop Performance/DeleteSuffix (#24077 )	1 year ago
Claire	f432db7b9f	Fix sidekiq jobs not triggering Elasticsearch index updates (#24046 )	1 year ago
Matt Jankowski	1ed12d5e2f	Add basic search specs for chewy indexes (#24065 )	1 year ago
Nick Schonning	3ea0856f70	Enable RSpec/FilePath (#23965 )	1 year ago
dependabot[bot]	8931f18a21	Bump eslint from 8.33.0 to 8.35.0 (#24049 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	540d49ec14	Bump pghero from 3.1.0 to 3.2.0 (#24044 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Matt Jankowski	688287c59d	Coverage improvement round-out following up previous work (#23987 )	1 year ago
Matt Jankowski	56bddfbfa3	Serializers spec coverage (#24017 )	1 year ago
dependabot[bot]	53309fa31a	Bump puma from 6.1.0 to 6.1.1 (#24045 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Nick Schonning	4fa542f3c4	Sync CI and Docker Compose image versions (#24053 )	1 year ago
Rodion Borisov	a52ccd7ad9	Center the text itself in upload area (#24029 )	1 year ago
Matt Jankowski	2f7a663b0b	Explicitly set github repo in instance presenter spec (#24036 )	1 year ago
Christian Schmidt	684a970b3c	Unescape HTML entities (#24019 )	1 year ago
Nick Schonning	9dfe2dbd3f	Skip rebase-needed job for i10n branch (#24026 )	1 year ago
9p4	b715bd8e53	Add refreshing many accounts at once with "tootctl accounts refresh" (#23304 )	1 year ago
dependabot[bot]	0bc1a002fd	Bump babel-jest from 29.4.3 to 29.5.0 (#24007 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	f47c404f88	Bump mkdirp from 2.1.3 to 2.1.5 (#23994 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	60d664eab8	Bump rubocop from 1.45.1 to 1.48.0 (#23999 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	a47358e27c	Bump jest-environment-jsdom from 29.4.3 to 29.5.0 (#23998 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	71cd77536d	Bump jest from 29.4.3 to 29.5.0 (#24003 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	5da3fd170e	Bump doorkeeper from 5.6.4 to 5.6.5 (#24009 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	c9860d36d4	Bump omniauth_openid_connect from 0.6.0 to 0.6.1 (#23991 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	3d46823e9f	Bump utf-8-validate from 6.0.2 to 6.0.3 (#23992 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	ff1913d58f	Bump axios from 1.3.3 to 1.3.4 (#23996 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	aabf2bf8d6	Bump rack from 2.2.6.2 to 2.2.6.3 (#23997 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	49a4a7fa83	Bump sidekiq-scheduler from 5.0.1 to 5.0.2 (#24004 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	722349963c	Bump yargs from 17.7.0 to 17.7.1 (#24002 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
dependabot[bot]	6ee39e85f3	Bump pg from 1.4.5 to 1.4.6 (#24001 ) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	1 year ago
Nick Schonning	fb13f37475	Skip double building on Dependabot branches (#24025 )	1 year ago
Nick Schonning	e594bb7d50	Convert CircleCI to GitHub Actions (#23608 )	1 year ago
Claire	174352716a	Disable anonymous access to the streaming API (#23989 )	1 year ago

1 2 3 4 5 ...

17357 Commits (3ef5f62abfc65085604265cfa2559b4d9ae98ace) All Branches Search

17357 Commits (3ef5f62abfc65085604265cfa2559b4d9ae98ace)

All Branches