about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2023-03-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-03-18Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-03-18Upgrade redis-node to latest (#24154)Nick Schonning
2023-03-18Revert "Dedupe yarn.lock with yarn-deduplicate" (#24155)Nick Schonning
2023-03-18Dedupe yarn.lock with yarn-deduplicate (#24119)Nick Schonning
2023-03-17Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142)Jean byroot Boussier
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17Include config/ and update all rubcop deps (#23963)Nick Schonning
2023-03-17Link to the Identity provider's account settings from the account settings ↵CSDUMMI
(#24100) Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17Bump rimraf from 4.1.2 to 4.4.0 (#24048)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-17Bump glob from 8.1.0 to 9.3.0 (#24110)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16[Glitch] Replace `Status#translatable?` with language matrix in separate ↵Christian Schmidt
endpoint Port bd047acc356671727c112336bb237f979bba517d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
2023-03-16Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-03-16Ignore additional Style/OptionalBooleanParameter (#24138)Nick Schonning
2023-03-16Add warning for object storage misconfiguration (#24137)Claire
2023-03-16Change user backups to use expiring URLs for download when possible (#24136)Eugen Rochko
2023-03-16Roll back unintentionally activated rubocop rules (#24132)Matt Jankowski
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-03-16New Crowdin updates (#23904)Eugen Rochko
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16Replace `Status#translatable?` with language matrix in separate endpoint ↵Christian Schmidt
(#24037)
2023-03-16Refactor monkey-patching of `PrivateAddressCheck` (#24122)Eugen Rochko
2023-03-16Regen rubocop-todo without Max shadowing (#24076)Nick Schonning
2023-03-16Bump sass from 1.58.3 to 1.59.3 (#24105)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Bump autoprefixer from 10.4.13 to 10.4.14 (#24108)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Add cache headers to static files served through Rails (#24120)Eugen Rochko
2023-03-16Bump @babel/core from 7.21.0 to 7.21.3 (#24111)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Add `SENDFILE_HEADER` environment variable (#24123)Eugen Rochko
2023-03-16Remove `bullet` and `active_record_query_trace` gems (#24121)Eugen Rochko
2023-03-16Bump eslint from 8.35.0 to 8.36.0 (#24089)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Bump @babel/eslint-parser from 7.19.1 to 7.21.3 (#24109)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Bump immutable from 4.2.4 to 4.3.0 (#24088)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Autofix Rubocop Style/RedundantArgument (#23798)Nick Schonning
2023-03-16Bump rack-test from 2.0.2 to 2.1.0 (#24112)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16Autofix Rubocop Style/PreferredHashMethods (#23851)Nick Schonning
2023-03-15Fix more haml-lint Rubocop (#24107)Nick Schonning
2023-03-15Skip pushing containers on forks (#24106)Nick Schonning
2023-03-15Use Github Container Registry as the official container image source (#24113)Renaud Chaput
2023-03-15[Glitch] Center the text itself in upload areaRodion Borisov
Port a52ccd7ad98d7d60dffb520c0397ba8aa4c2eb9d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15[Glitch] add modal message when editing tootPauloVilarinho
Port 8770473dbb92042f76e058469a76e5bb4beecb9f to glitch-soc Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
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.
2023-03-15Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2023-03-15Setup haml-lint CI with todo config (#23524)Nick Schonning
2023-03-15Fix misleading error code when receiving invalid WebAuthn credentials (#23568)Claire
2023-03-15Fix incorrect post links in strikes when the account is remote (#23611)Claire
2023-03-15Fix dashboard crash on ElasticSearch server error (#23751)Claire
2023-03-15Update PostCSS dependencies (#23835)Nick Schonning
2023-03-15Add spec for the CLI `version` task (#23978)Matt Jankowski
2023-03-15Redirect users to SLO at the IdP after logging them out of Mastodon. (#24020)CSDUMMI
2023-03-15Change sidekiq-bulk's batch size from 10,000 to 1,000 jobs in one Redis call ↵Claire
(#24034)
2023-03-15Skip Docker CI Login/Push on forks (#23564)Nick Schonning
2023-03-14Push Docker images to Github Container Registry as well (#24101)Renaud Chaput
generated by cgit-pink (git 2.37.1) at 2024-11-16 09:14:35 +0000