tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,088 Commits 10 Branches 0 Tags
ea9a1d79df60749eb21fb592c608dcaa4c935c75
Commit Graph

17088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Schonning
ea9a1d79df [Glitch] Upgrade to Stylelint 15 with Prettier 
Port 0c9d455ea5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-18 16:02:12 +01:00
Nick Schonning
7e64eef73b [Glitch] Enable ESLint no-useless-escape 
Port db2c58d47a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-18 16:02:12 +01:00
Claire
587f6b3b06 [Glitch] Enable ESLint import recommended rules 
Port eddfb33dfe to glitch-soc
 2023-02-18 16:02:12 +01:00
Dean Bassett
40fc917a86 [Glitch] Fix case-sensitive check for previously used hashtags 
Port 4da5f77d92 to glitch-soc

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-13 20:04:45 +01:00
Claire
ce84d163cc 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
d6930b3847 Add API parameter to safeguard unexpect mentions in new posts (#18350) 2023-02-13 16:36:29 +01:00
Shlee
c84f38abc4 chewy from 7.2.4 to 7.2.7 (#23572) 2023-02-13 16:33:34 +01:00
Varun Sharma
45e2936c89 Add tests to indicate inclusion of self replies in statuses endpoint (#23266) 2023-02-13 16:04:26 +01:00
Stan Hu
f553b064e0 Switch OpenID Connect gems (#23223) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-13 15:47:50 +01:00
Nick Schonning
eddfb33dfe Enable ESLint import recommended rules (#23315) 2023-02-13 15:12:31 +01:00
Nick Schonning
db2c58d47a Enable ESLint no-useless-escape (#23311) 2023-02-13 15:12:14 +01:00
Dean Bassett
4da5f77d92 Fix case-sensitive check for previously used hashtags (#23526) 2023-02-13 14:54:08 +01:00
Nick Schonning
841263a548 Update Ruby to 3.0.5 (#23544) 2023-02-13 14:39:24 +01:00
Jeong Arm
5f56818f9e 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]
93d7c26fa5 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
cc92c65d83 Add dependency on net-http (#23571) 2023-02-13 14:36:07 +01:00
dependabot[bot]
66f2ad483c 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]
31352f0d2c 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
c55568c75a Add tests for REST::AccountSerializer (#23319) 2023-02-13 13:23:59 +01:00
Nick Schonning
7c5d396fca Replace hamlit-rails with haml-rails (#23542) 2023-02-13 04:59:30 +01:00
Takeshi Umeda
d874877b27 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
c6b7e04120 Sync Node.js to 16.19 patch release (#23554) 2023-02-13 04:58:37 +01:00
Nick Schonning
a1c0573bc6 Yarn cache cleanup right after install in Docker (#23557) 2023-02-13 04:57:51 +01:00
Nick Schonning
0c9d455ea5 Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
Dean Bassett
ee42505452 fix hashtag ordering (#2107) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-02-12 18:58:02 +01:00
Claire
8eb74c88ec 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
c812cfa667 Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
Eugen Rochko
e7b81d7d96 Bump blurhash from 0.1.6 to 0.1.7 (#23517) 2023-02-11 04:02:07 +01:00
emilweth
7c45145430 fix metrics format (#23520) 2023-02-11 03:00:44 +01:00
emilweth
c1b823368c dot is not allowed (#23519) 2023-02-11 02:15:07 +01:00
Claire
dc02a93d04 Merge pull request #2105 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-02-10 22:56:36 +01:00
Claire
87419f9307 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 22:49:59 +01:00
Claire
61c5dfb929 Update changelog (#23515) 2023-02-10 22:48:49 +01:00
Claire
70c0d754a6 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
0c9eac80d8 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
719bb799be Remove DesspSouce config (#23513) 2023-02-10 22:04:13 +01:00
Claire
bae17ebe5e Fix attached media uploads not being cleared when replying to a post (#23504) 2023-02-10 22:03:35 +01:00
Eugen Rochko
71ae17e8f5 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
4ceadc65b0 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 13:48:21 +01:00
Claire
a9c220242b Fix admin-set follow recommandations being case-sensitive (#23500) 
Fixes #23472
 2023-02-10 11:14:58 +01:00
Claire
67de888bad Fix server status URL being a required server setting (#23499) 2023-02-10 10:20:43 +01:00
Nick Schonning
f23d30100a 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
5e37906083 [Glitch] Add scrolling to Compare history modal 
Port e8cb3ee827 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
2dfbdc3f9d [Glitch] Show spinner while loading follow requests 
Port c1f32c9c14 to glitch-soc

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

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

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-09 12:58:11 +01:00
Claire
85558a5e18 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
c5a4d8c82d Add information about database pool to metrics endpoint in streaming API (#23469) 2023-02-09 11:24:16 +01:00
Eugen Rochko
4cb7647516 Add database pool configuration over DB_POOL to streaming API (#23470) 
Add connection timeout of 15s
 2023-02-09 11:20:59 +01:00