me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
38631 commits 2 branches 0 tags 429 MiB
Commit graph

38631 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
0ae0740826 Add API parameter to safeguard unexpect mentions in new posts (#18350) 2023-02-13 16:36:29 +01:00
Claire
d6930b3847
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
Shlee
c84f38abc4
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
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
7ab1306c20 Switch OpenID Connect gems (#23223) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-13 15:47:50 +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
2663b421be Enable ESLint import recommended rules (#23315) 2023-02-13 15:12:31 +01:00
Nick Schonning
eddfb33dfe
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
Nick Schonning
db2c58d47a
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
Dean Bassett
4da5f77d92
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
Nick Schonning
841263a548
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
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]
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
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
9a70c0de00 Add dependency on net-http (#23571) 2023-02-13 14:36:07 +01:00
Claire
cc92c65d83
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]
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]
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
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
5410c06ca1 Add tests for REST::AccountSerializer (#23319) 2023-02-13 13:23:59 +01:00
Claire
c55568c75a
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
Nick Schonning
7c5d396fca
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
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
5bf8be8122 Sync Node.js to 16.19 patch release (#23554) 2023-02-13 04:58:37 +01:00
Nick Schonning
c6b7e04120
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
a1c0573bc6
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
Nick Schonning
0c9d455ea5
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
Dean Bassett
ee42505452
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
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
3ed6bf7cee Enable EditorConfig trailing whitespace trimming (#23543) 2023-02-12 08:34:17 +01:00
Nick Schonning
c812cfa667
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
Eugen Rochko
e7b81d7d96
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
7c45145430
fix metrics format (#23520) 2023-02-11 03:00:44 +01:00