3183 Commits (879c7ed2d3dd3d338a28d426426e95be0166b943)

Author	SHA1	Message	Date
Claire	454d8567d4	Merge commit '1814990a3d117555153321216fa593e4d9e84de3' into glitch-soc/merge-upstream	1 year ago
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' 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	b2515feb29	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	1 year ago
Claire	42f36aa55a	Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' 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	7635c67450	Merge commit '144a406d332b034caa812ade2629df03ed4898d7' 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	993d0a9950	Merge commit '1e3b19230a48174acf524cf1a9f5a498e220ea7d' 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]	8864d5b580	New Crowdin translations (#2327) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Matt Jankowski	b06763dc11	Remove the `sr` locale override .rb files (#25927)	1 year ago
github-actions[bot]	b9adea9695	New Crowdin Translations (automated) (#26072) ... Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Matt Jankowski	bada7a65aa	Ignore long line in regex initializer (#26182)	1 year ago
Eugen Rochko	4d01d1a1ee	Remove 16:9 cropping from web UI (#26132)	1 year ago
mogaminsk	db310f383d	Fix missing translation strings for importing lists (#26120)	1 year ago
github-actions[bot]	9ec43107f2	New Crowdin translations (#2319) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
github-actions[bot]	9a45198ab0	New Crowdin translations (#2317) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Christian Schmidt	296ec6cf57	Override default Action Mailer `preview_path` (#26110)	1 year ago
gunchleoc	217ef7f2af	Replace 'favourite' by 'favorite' for American English (#26009)	1 year ago
Claire	e5f1000ad1	Fix CSP headers being unintendedly wide (#26105)	1 year ago
Claire	934c7b33d1	Change default KeyGenerator digest to SHA1 to fix cookies in rolling upgrades (#26023)	1 year ago
Renaud Chaput	42698b4c5c	Fix the crossorigin attribute (#26096)	1 year ago
github-actions[bot]	e7cb6c6c44	New Crowdin translations (#2314) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
gunchleoc	cabe1ea560	Change casing for 'Server Settings' string (#26011)	1 year ago
Misty De Méo	b848ba3867	Paperclip: add support for Azure blob storage (#23607)	1 year ago
Matt Jankowski	6edd404482	Cleanup unused portions of statuses/status partial (#26045)	1 year ago
github-actions[bot]	2649fbce04	New Crowdin translations (#2310) ... Co-authored-by: GitHub Actions <noreply@github.com>	1 year ago
Claire	0092fe50ac	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	111686c38b	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]	47832a1ac0	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	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Eugen Rochko	26e522ac55	Fix not actually connecting to the configured replica (#25977)	1 year ago
Claire	d9adda1a99	Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream	1 year ago
Stanislas Signoud	5fad7bd58a	Change links in multi-column mode so tabs are open in single-column mode (#25893)	1 year ago
Claire	41f65edb21	Fix embed dropdown menu item for unauthenticated users (#25964)	1 year ago
Matt Jankowski	644c5fddd8	Refactor `Status.tagged_with_all` for brakeman SQL injection warning (#25941)	1 year ago
Claire	2d09653d50	Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' 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	ce43ed144c	Rails 7.0 update (#25668)	1 year ago
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' 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	2aadebc769	Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' 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	075887e1d6	Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream	1 year ago
Claire	dd0002e1fe	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' 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	82eebd0482	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' 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	7e54a30f06	Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream	1 year ago
Matt Jankowski	1ef014802b	Refactor `Trends::Query` to avoid brakeman sql injection warnings (#25881)	1 year ago
Matt Jankowski	f831452037	Refactor `Snowflake` to avoid brakeman sql injection warnings (#25879)	1 year ago
Matt Jankowski	2e1391fdd2	Fix `Naming/MemoizedInstanceVariableName` cop (#25928)	1 year ago
Matt Jankowski	b786911c55	Fix `Lint/SendWithMixinArgument` cop (#25920)	1 year ago
Nick Schonning	1d557305d2	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	1 year ago
Claire	9411fa4d36	Update brakeman ignores (#25912)	1 year ago
Nick Schonning	e11032585b	Run brakeman in GitHub Actions (#23713)	1 year ago
Claire	4b5851974c	Fix moderation interface for remote instances with a .zip TLD (#25885)	1 year ago
Matt Jankowski	cf33028f35	Admin mailer parameterization (#25759)	1 year ago