3179 Commits (cf47592d87d8352febca6f4468969b04ed9aeb4e)

Author	SHA1	Message	Date
Claire	f55959ebd9	Merge commit '1d29569d89c81b439c6a1d86c8f85cc48a9649c8' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	1 year ago
Claire	1039fce896	Merge commit '5a5d8a97579bf2da481871588425734678019f52' into glitch-soc/merge-upstream	1 year ago
Claire	cb4ffdea8b	Merge commit '1d3f8af23a23c2d3d8399d7b4367de69b72e269a' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.	1 year ago
Claire	db809f8789	Merge commit 'f3127af389f6043fe19c9ef4addefb6c6da0095a' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change.	1 year ago
Claire	2f3f1d75fa	Merge commit '58b52b7a33717406faa8d988b7c05efa52f46f6a' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream added new validations close to lines on which glitch-soc had modified validations to handle custom limits set through environment variables. Ported upstream changes. - `config/initializers/content_security_policy.rb`: Upstream added `AZURE_ALIAS_HOST`. Glitch-soc's version of the file is completely different. Added `AZURE_ALIAS_HOST` to our version of the file.	1 year ago
github-actions[bot]	df7c9e1ed4	New Crowdin translations (#2327) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Eugen Rochko	1c28a202fe	Remove 16:9 cropping from web UI (#26132)	1 year ago
mogaminsk	5cc1f7e73c	Fix missing translation strings for importing lists (#26120)	1 year ago
github-actions[bot]	d6e767559c	New Crowdin translations (#2319) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
github-actions[bot]	9279c388c5	New Crowdin translations (#2317) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Christian Schmidt	579e15fb7d	Override default Action Mailer `preview_path` (#26110)	1 year ago
gunchleoc	257fadcec4	Replace 'favourite' by 'favorite' for American English (#26009)	1 year ago
Claire	5664c5370f	Fix CSP headers being unintendedly wide (#26105)	1 year ago
Claire	c5b79558e2	Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023)	1 year ago
Renaud Chaput	f31a9bd78e	Fix the crossorigin attribute (#26096)	1 year ago
github-actions[bot]	356f2fc4c5	New Crowdin translations (#2314) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
gunchleoc	31dc72c828	Change casing for 'Server Settings' string (#26011)	1 year ago
Misty De Méo	9e19cfdb05	Paperclip: add support for Azure blob storage (#23607)	1 year ago
Matt Jankowski	4be315f0ae	Cleanup unused portions of statuses/status partial (#26045)	1 year ago
github-actions[bot]	b3bc0e93e1	New Crowdin translations (#2310) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Claire	d315c684e4	Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream entirely refactored this, while we changed the docker repository to upload to and disabled the “latest” tag. Applied the repository change to `.github/workflows/build-*.yml`, as well as disabling native ARMv64 builds. - `README.md`: We have a completely different README. Kept ours. - `app/views/admin/settings/shared/_links.html.haml`: Upstream refactored, we had an extra item. Refactored as upstream did. - `spec/controllers/api/v1/timelines/public_controller_spec.rb`: Upstream deleted this file, to be replaced by a request spec at `spec/requests/api/v1/timelines/public_spec.rb`. We had an extra bit about enabling the public timelines because we have different defaults than upstream. Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb`	1 year ago
Claire	4c50463116	New Crowdin updates (#2306) ... * New translations en.json (French) [ci skip] * New translations en.json (Spanish) [ci skip] * New translations en.json (Afrikaans) [ci skip] * New translations en.json (Arabic) [ci skip] * New translations en.json (Czech) [ci skip] * New translations en.json (German) [ci skip] * New translations en.json (Irish) [ci skip] * New translations en.json (Japanese) [ci skip] * New translations en.json (Georgian) [ci skip] * New translations en.json (Korean) [ci skip] * New translations en.json (Lithuanian) [ci skip] * New translations en.json (Macedonian) [ci skip] * New translations en.json (Punjabi) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Turkish) [ci skip] * New translations en.json (Ukrainian) [ci skip] * New translations en.json (Chinese Simplified) [ci skip] * New translations en.json (Chinese Traditional) [ci skip] * New translations en.json (Urdu (Pakistan)) [ci skip] * New translations en.json (Portuguese, Brazilian) [ci skip] * New translations en.json (Persian) [ci skip] * New translations en.json (Tamil) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.json (Spanish, Mexico) [ci skip] * New translations en.json (Bengali) [ci skip] * New translations en.json (Marathi) [ci skip] * New translations en.json (Croatian) [ci skip] * New translations en.json (Kazakh) [ci skip] * New translations en.json (Telugu) [ci skip] * New translations en.json (English, United Kingdom) [ci skip] * New translations en.json (Esperanto) [ci skip] * New translations en.json (Uyghur) [ci skip] * New translations en.json (Tatar) [ci skip] * New translations en.json (Malayalam) [ci skip] * New translations en.json (Latin) [ci skip] * New translations en.json (Bosnian) [ci skip] * New translations en.json (French, Quebec) [ci skip] * New translations en.json (Cornish) [ci skip] * New translations en.json (Kannada) [ci skip] * New translations en.json (Occitan) [ci skip] * New translations en.json (Igbo) [ci skip] * New translations en.json (Sardinian) [ci skip] * New translations en.json (Kabyle) [ci skip] * New translations en.yml (Spanish) [ci skip] * New translations en.yml (Italian) [ci skip] * New translations en.yml (Norwegian) [ci skip] * New translations en.yml (Ukrainian) [ci skip] * New translations en.yml (Chinese Simplified) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Mexico) [ci skip] * New translations en.yml (Esperanto) [ci skip] * New translations simple_form.en.yml (French) [ci skip] * New translations simple_form.en.yml (Spanish) [ci skip] * New translations simple_form.en.yml (Czech) [ci skip] * New translations simple_form.en.yml (German) [ci skip] * New translations simple_form.en.yml (Italian) [ci skip] * New translations simple_form.en.yml (Korean) [ci skip] * New translations simple_form.en.yml (Norwegian) [ci skip] * New translations simple_form.en.yml (Polish) [ci skip] * New translations simple_form.en.yml (Ukrainian) [ci skip] * New translations simple_form.en.yml (Chinese Simplified) [ci skip] * New translations simple_form.en.yml (Portuguese, Brazilian) [ci skip] * New translations simple_form.en.yml (Spanish, Argentina) [ci skip] * New translations simple_form.en.yml (Spanish, Mexico) [ci skip] * New translations simple_form.en.yml (French, Quebec) [ci skip] * New translations en.json (Polish) [ci skip] * New translations en.json (Spanish, Argentina) [ci skip] * New translations en.yml (Spanish, Argentina) [ci skip]	1 year ago
github-actions[bot]	33a41a214a	New Crowdin Translations (automated) (#26054) ... Co-authored-by: renchap <renchap@users.noreply.github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Claire	0ef1efbe71	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Eugen Rochko	45a7291d2c	Fix not actually connecting to the configured replica (#25977)	1 year ago
Claire	efa6d4416c	Merge commit '528a8d0cbeaad7d73fc0dc310d4199701e0353a3' into glitch-soc/merge-upstream	1 year ago
Stanislas Signoud	663e9484e2	Change links in multi-column mode so tabs are open in single-column mode (#25893)	1 year ago
Claire	618eb10d18	Fix embed dropdown menu item for unauthenticated users (#25964)	1 year ago
Matt Jankowski	ecf7aa0fb3	Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941)	1 year ago
Claire	c6212d89f8	Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`.	1 year ago
Matt Jankowski	5cdc196e44	Rails 7.0 update (#25668)	1 year ago
Claire	1399e9d863	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	1 year ago
Claire	9af6f6db1a	Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes	1 year ago
Claire	2189682f8f	Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream	1 year ago
Claire	54b6b035a7	Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.	1 year ago
Claire	63ca7222d6	Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.	1 year ago
Claire	8a27e68050	Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream	1 year ago
Matt Jankowski	1b1ecf8ee2	Refactor `Trends::Query` to avoid brakeman sql injection warnings (#25881)	1 year ago
Matt Jankowski	034a6a0dd4	Refactor `Snowflake` to avoid brakeman sql injection warnings (#25879)	1 year ago
Matt Jankowski	08421e7b90	Fix `Naming/MemoizedInstanceVariableName` cop (#25928)	1 year ago
Matt Jankowski	4932925530	Fix `Lint/SendWithMixinArgument` cop (#25920)	1 year ago
Nick Schonning	96a8aa32ad	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
Claire	086ddcb021	Update brakeman ignores (#25912)	1 year ago
Nick Schonning	639c066a09	Run brakeman in GitHub Actions (#23713)	1 year ago
Claire	2b174c0d78	Fix moderation interface for remote instances with a .zip TLD (#25885)	1 year ago
Matt Jankowski	6555c33503	Admin mailer parameterization (#25759)	1 year ago
Kurtis Rainbolt-Greene	a27f2686ca	First pass at multi-database for read replica using Rails native adapter (#25693) ... Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>	1 year ago
Matt Jankowski	3f04f0c37b	Regenerate brakeman ignore, pruning warnings (#25749)	1 year ago
Claire	3581e4be49	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Claire	3445bdfa45	Merge pull request from GHSA-9928-3cp5-93fm ... * Fix attachments getting processed despite failing content-type validation * Add a restrictive ImageMagick security policy tailored for Mastodon * Fix misdetection of MP3 files with large cover art * Reject unprocessable audio/video files instead of keeping them unchanged	1 year ago