Commit graph

17086 commits

Author SHA1 Message Date
Claire
70984c6f65 [Glitch] Enable ESLint import recommended rules
Port 2663b421be to glitch-soc
2023-02-18 16:02:12 +01:00
Dean Bassett
6c64af449c [Glitch] Fix case-sensitive check for previously used hashtags
Port 28bc6265bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13 20:05:36 +01:00
Claire
b525ce4bf9 [Glitch] Fix attached media uploads not being cleared when replying to a post
Port 3c1e48d304 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13 20:04:45 +01:00
Claire
92d1e05c3e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Upstream added a line at the end, glitch-soc had extra entries at the end.
  Added upstream's new line before glitch-soc's.
- `Gemfile.lock`:
  Upstream updated dependencies while glitch-soc has an extra one (hcaptcha).
  Updated dependencies like upstream did.
- `app/controllers/api/v1/statuses_controller.rb`:
  Not a real conflict, upstream added a parameter (`allowed_mentions`) where
  glitch-soc already had an extra one (`content_type`).
  Added upstream's new parameter.
- `app/javascript/styles/fonts/roboto-mono.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
- `app/javascript/styles/fonts/roboto.scss`:
  A lot of lines were changed upstream due to code style changes, and a lot
  of those lines had path changes to accomodate glitch-soc's theming system.
  Applied upstream's style changes.
2023-02-13 19:35:35 +01:00
Claire
0ae0740826 Add API parameter to safeguard unexpect mentions in new posts (#18350) 2023-02-13 16:36:29 +01:00
Shlee
5a13f1d2ad chewy from 7.2.4 to 7.2.7 (#23572) 2023-02-13 16:33:34 +01:00
Varun Sharma
1ac0afccc2 Add tests to indicate inclusion of self replies in statuses endpoint (#23266) 2023-02-13 16:04:26 +01:00
Stan Hu
7ab1306c20 Switch OpenID Connect gems (#23223)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13 15:47:50 +01:00
Nick Schonning
2663b421be Enable ESLint import recommended rules (#23315) 2023-02-13 15:12:31 +01:00
Nick Schonning
1c2ca9557f Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
Dean Bassett
28bc6265bf Fix case-sensitive check for previously used hashtags (#23526) 2023-02-13 14:54:08 +01:00
Nick Schonning
17e3cdb81b Update Ruby to 3.0.5 (#23544) 2023-02-13 14:39:24 +01:00
Jeong Arm
c2cb5defb0 Change followed_by link to location=all if account is local on /admin/accounts/:id page (#23467) 2023-02-13 14:39:00 +01:00
dependabot[bot]
b44fa2623a Bump rubocop from 1.44.1 to 1.45.1 (#23523)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-13 14:38:43 +01:00
Claire
9a70c0de00 Add dependency on net-http (#23571) 2023-02-13 14:36:07 +01:00
dependabot[bot]
6ab50dfd94 Bump sidekiq-scheduler from 5.0.0 to 5.0.1 (#23569)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-13 13:55:55 +01:00
dependabot[bot]
d9fdce121c Bump sidekiq-scheduler from 4.0.3 to 5.0.0 (#23212)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-13 13:31:42 +01:00
Claire
5410c06ca1 Add tests for REST::AccountSerializer (#23319) 2023-02-13 13:23:59 +01:00
Nick Schonning
acf0bbcab8 Replace hamlit-rails with haml-rails (#23542) 2023-02-13 04:59:30 +01:00
Takeshi Umeda
2498b4f176 Update SECURITY.md (#23545)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-02-13 04:58:56 +01:00
Nick Schonning
5bf8be8122 Sync Node.js to 16.19 patch release (#23554) 2023-02-13 04:58:37 +01:00
Nick Schonning
97db92d368 Yarn cache cleanup right after install in Docker (#23557) 2023-02-13 04:57:51 +01:00
Nick Schonning
6417e06194 Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
Dean Bassett
ab546780eb fix hashtag ordering (#2107)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-02-12 18:58:02 +01:00
Claire
84c2fdb503 New Crowdin updates (#2100)
* New translations en.json (Korean)
[ci skip]

* New translations en.json (Portuguese, Brazilian)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.yml (Portuguese)
[ci skip]

* New translations en.json (Spanish)
[ci skip]

* New translations en.yml (Spanish)
[ci skip]

* New translations en.json (Spanish)
[ci skip]
2023-02-12 18:16:08 +01:00
Nick Schonning
3ed6bf7cee Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
Eugen Rochko
d070724298 Bump blurhash from 0.1.6 to 0.1.7 (#23517) 2023-02-11 04:02:07 +01:00
emilweth
1f777e2436 fix metrics format (#23520) 2023-02-11 03:00:44 +01:00
emilweth
7099c057d4 dot is not allowed (#23519) 2023-02-11 02:15:07 +01:00
Claire
0c7f356fd4 Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-02-10 22:56:36 +01:00
Claire
6917c854d1 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00
Claire
35e622a7a0 Update changelog (#23515) 2023-02-10 22:48:49 +01:00
Claire
20c6a153e4 Bump version to 4.1.0 (#23471)
* Bump version to 4.1.0

* Editorialize changelog some more and highlight API changes

* Update changelog
2023-02-10 22:21:23 +01:00
Claire
ea4cffac37 Fix unbounded recursion in post discovery (#23506)
* Add a limit to how many posts can get fetched as a result of a single request

* Add tests

* Always pass `request_id` when processing `Announce` activities

---------

Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
2023-02-10 22:16:37 +01:00
Nick Schonning
5eac0c92d5 Remove DesspSouce config (#23513) 2023-02-10 22:04:13 +01:00
Claire
3c1e48d304 Fix attached media uploads not being cleared when replying to a post (#23504) 2023-02-10 22:03:35 +01:00
Eugen Rochko
b21f5906b9 New Crowdin updates (#23413)
* New translations en.json (Esperanto)

* New translations en.yml (Slovak)

* New translations en.json (Burmese)

* New translations en.yml (Korean)

* New translations en.json (Burmese)

* New translations en.json (Burmese)

* New translations en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations en.json (Burmese)

* New translations en.yml (Burmese)

* New translations en.yml (Burmese)

* New translations en.json (Burmese)

* New translations activerecord.en.yml (Burmese)

* New translations en.yml (Burmese)

* New translations activerecord.en.yml (Burmese)

* New translations en.json (German)

* New translations simple_form.en.yml (German)

* New translations en.json (Catalan)

* New translations en.yml (Burmese)

* New translations en.yml (Burmese)

* New translations en.yml (Russian)

* New translations doorkeeper.en.yml (Russian)

* New translations simple_form.en.yml (Russian)

* New translations en.json (Russian)

* New translations en.json (Belarusian)

* New translations en.json (Belarusian)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations doorkeeper.en.yml (Korean)

* New translations en.json (Burmese)

* New translations en.yml (Slovak)

* New translations en.yml (Belarusian)

* New translations simple_form.en.yml (Belarusian)

* New translations simple_form.en.yml (Esperanto)

* New translations doorkeeper.en.yml (Esperanto)

* New translations activerecord.en.yml (Esperanto)

* New translations devise.en.yml (Esperanto)

* New translations en.yml (English, United Kingdom)

* New translations en.yml (Asturian)

* New translations simple_form.en.yml (Asturian)

* New translations en.yml (Asturian)

* New translations doorkeeper.en.yml (Asturian)

* New translations en.json (Asturian)

* New translations en.yml (Asturian)

* New translations en.json (Asturian)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations en.json (Korean)

* New translations en.yml (Korean)

* New translations devise.en.yml (Korean)

* New translations simple_form.en.yml (Korean)

* New translations en.json (Welsh)

* New translations en.yml (Welsh)

* New translations simple_form.en.yml (Welsh)

* New translations activerecord.en.yml (Welsh)

* New translations devise.en.yml (Welsh)

* New translations doorkeeper.en.yml (Welsh)

* New translations en.yml (Burmese)

* New translations en.yml (Burmese)

* New translations en.yml (Burmese)

* New translations en.json (Silesian)

* New translations en.yml (Occitan)

* New translations en.yml (Turkish)

* New translations simple_form.en.yml (Turkish)

* New translations en.json (Occitan)

* New translations activerecord.en.yml (Turkish)

* New translations doorkeeper.en.yml (Turkish)

* Normalize

* Remove unused locales

---------

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-11 05:42:08 +09:00
Claire
fce6c27f41 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 13:48:21 +01:00
Claire
1a094b002d Fix admin-set follow recommandations being case-sensitive (#23500)
Fixes #23472
2023-02-10 11:14:58 +01:00
Claire
cdcf981ad7 Fix server status URL being a required server setting (#23499) 2023-02-10 10:20:43 +01:00
Nick Schonning
b791fb97fc Cleanup unused i18n strings (#23426)
* Remove partial 422/500 error translations

* Add missing siblings for i18n unused warnings

* Enable i18n unused string checking for all locales
2023-02-09 22:46:42 +09:00
cadars
f925f5bf2f [Glitch] Add scrolling to Compare history modal
Port 7406c66b77 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 13:03:41 +01:00
Christian Schmidt
54e6fa1363 [Glitch] Show spinner while loading follow requests
Port 059a055e65 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 13:02:32 +01:00
Christian Schmidt
71629f6f99 [Glitch] Spell check input fields
Port 9b74ffa7e0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 12:59:48 +01:00
Eugen Rochko
664847db15 [Glitch] Add setting for status page URL
Port 92e5feb621 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-02-09 12:58:11 +01:00
Claire
5f26e6e7ca Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Minor upstream change, our README is completely different.
  Kept ours.
- `lib/tasks/assets.rake`:
  glitch-soc has extra code to deal with its theming system,
  upstream changed a line that exists in glitch-soc.
  Applied upstream changes.
2023-02-09 12:46:12 +01:00
Eugen Rochko
6716afb8f8 Add information about database pool to metrics endpoint in streaming API (#23469) 2023-02-09 11:24:16 +01:00
Eugen Rochko
83eba2d6cf Add database pool configuration over DB_POOL to streaming API (#23470)
Add connection timeout of 15s
2023-02-09 11:20:59 +01:00
Claire
1c08aef482 Remove posts count and last posts from ActivityPub representation of hashtag collections (#23460) 2023-02-08 17:57:25 +01:00
dependabot[bot]
11973d9956 Bump axios from 1.2.6 to 1.3.2 (#23420)
Bumps [axios](https://github.com/axios/axios) from 1.2.6 to 1.3.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.2.6...v1.3.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-08 10:54:51 +01:00