about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2023-03-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.
2023-03-22Fix Rails cache namespace being overriden with `v2` for cached statuses (#24202)Claire
2023-03-22Remove unused InstancePresenter methods (#24206)Matt Jankowski
2023-03-22Add specs for Chewy importers (#24204)Matt Jankowski
2023-03-22Update profile link verification instructions (#19723)Simon Elvery
Co-authored-by: Effy Elden <effy@effy.space>
2023-03-21Bump version to v4.1.1 (#24201)Claire
2023-03-21Refactoring relations_map (#24195)Takeshi Umeda
2023-03-21Bump stackprof from 0.2.23 to 0.2.24 (#24190)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21Bump prettier from 2.8.4 to 2.8.5 (#24188)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21Bump stylelint from 15.2.0 to 15.3.0 (#24185)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21Bump react-select from 5.7.0 to 5.7.1 (#24187)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21Bump rack-cors from 1.1.1 to 2.0.1 (#24189)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21Bump pghero from 3.3.0 to 3.3.1 (#24186)dependabot[bot]
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-20Fit the max-width of media in .prose to parent box (#24180)mogamin
2023-03-20Remove references to non-existent actions (#24183)Matt Jankowski
2023-03-20Fix crash in `tootctl` commands making use of parallelization when ↵Claire
Elasticsearch is enabled (#24182)
2023-03-20Remove `Permissions-Policy` header from all responses (#24124)Eugen Rochko
2023-03-19Add getting-started-misc to route (#2141)Plastikmensch
* Add getting-started-misc to web_app_paths Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Add signed in check to navigation entries Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors. Also fixed the keys as these were literally "i++". Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Remove "Extended information" from getting-started-misc I couldn't find any reference to this translation string, so I removed it too. Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19Webhooks for local status.create, status.update, account.update (#24133)Vyr Cossont
2023-03-18Merge pull request #2138 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
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>
generated by cgit-pink (git 2.37.1) at 2024-11-25 23:55:20 +0000