3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
15fdd94e2f
Update PostCSS dependencies ( #23835 )
2023-03-15 04:01:10 +01:00
245f0aead2
Bump jsdom from 21.1.0 to 21.1.1 ( #24090 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-13 11:16:24 +01:00
8931f18a21
Bump eslint from 8.33.0 to 8.35.0 ( #24049 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-10 15:24:19 +01:00
0bc1a002fd
Bump babel-jest from 29.4.3 to 29.5.0 ( #24007 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 16:25:16 +01:00
f47c404f88
Bump mkdirp from 2.1.3 to 2.1.5 ( #23994 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 12:54:12 +01:00
a47358e27c
Bump jest-environment-jsdom from 29.4.3 to 29.5.0 ( #23998 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 12:14:18 +01:00
71cd77536d
Bump jest from 29.4.3 to 29.5.0 ( #24003 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 12:00:05 +01:00
3d46823e9f
Bump utf-8-validate from 6.0.2 to 6.0.3 ( #23992 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:32:44 +01:00
ff1913d58f
Bump axios from 1.3.3 to 1.3.4 ( #23996 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:32:21 +01:00
722349963c
Bump yargs from 17.7.0 to 17.7.1 ( #24002 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-08 11:30:36 +01:00
7623e18124
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream README has been changed, but we have a completely different one.
Kept our `README.md`.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Change the code style to match upstream's but otherwise do not change our
code.
- `spec/lib/sanitize_config_spec.rb`:
Upstream added support for more incoming HTML tags (a large subset of what
glitch-soc accepts).
Kept our version, since the tests are mostly glitch-soc's, except for cases
which are purposefuly different.
2023-03-05 20:46:56 +01:00
0872f3e3d7
Allow streaming to connect to postgress with self-signed certs ( #21431 )
2023-03-03 21:01:18 +01:00
276c1d32d6
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-02 17:32:38 +01:00
59f42c262b
[Dependashlee] Bump @github/webauthn-json from 0.5.7 to 2.1.1 (js) ( #23819 )
2023-03-02 11:45:14 +01:00
083e18e45b
[Dependashlee] Bump fuzzysort from 1.9.0 to 2.0.4 (JS) ( #23822 )
2023-03-02 11:41:32 +01:00
6047c84468
[Dependashlee] Bump color-blend from 3.0.1 to 4.0.0 (JS) ( #23823 )
2023-03-02 11:08:22 +01:00
4ed09276d5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Upstream added a line at the end of the file, while glitch-soc had its own
extra lines.
Took upstream's change.
- `CONTRIBUTING.md`:
We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes.
Ported upstream changes.
- `app/controllers/application_controller.rb`:
Upstream made code style changes in a method that is entirely replaced
in glitch-soc.
Ignored the change.
- `app/models/account.rb`:
Code style changes textually close to glitch-soc-specific changes.
Ported upstream changes.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream code style changes.
Ignored them.
2023-02-25 14:00:40 +01:00
7ecf783dd3
Bump @babel/plugin-proposal-decorators from 7.20.13 to 7.21.0 ( #23769 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 11:35:27 +01:00
9d8349f0c4
Bump @babel/plugin-transform-react-inline-elements from 7.18.6 to 7.21.0 ( #23766 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 11:14:25 +01:00
24d265d604
Bump @babel/plugin-transform-runtime from 7.19.6 to 7.21.0 ( #23774 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 10:59:58 +01:00
a573641b15
Bump @babel/core from 7.20.12 to 7.21.0 ( #23767 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 10:46:03 +01:00
92a0afda28
Bump @babel/runtime from 7.20.13 to 7.21.0 ( #23773 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 10:44:51 +01:00
513316f768
Bump stylelint from 15.1.0 to 15.2.0 ( #23770 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 09:41:28 +01:00
57b83ce337
Bump blurhash from 2.0.4 to 2.0.5 ( #23771 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 09:33:30 +01:00
d58400d00c
Bump sass from 1.58.2 to 1.58.3 ( #23772 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-21 09:30:59 +01:00
7452a95998
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes while we have dropped this file.
Keep the file deleted.
- `.prettierignore`:
Upstream made changes at the end of the file, where we
had our extra lines.
Just moved our extra lines back at the end.
- `app/serializers/initial_state_serializer.rb`:
Upstream code style changes.
Applied them.
- `app/services/backup_service.rb`:
Upstream code style changes.
Applied them.
2023-02-19 10:42:55 +01:00
4a1bad2fd8
Bump babel-jest from 29.4.2 to 29.4.3 ( #23654 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-17 10:26:16 +01:00
640d1aec1f
Bump jest-environment-jsdom from 29.4.2 to 29.4.3 ( #23655 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-17 10:19:23 +01:00
df3faecb46
Bump jest from 29.4.2 to 29.4.3 ( #23657 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-17 09:56:03 +01:00
80ed656239
Bump yargs from 17.6.2 to 17.7.0 ( #23656 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-17 09:54:14 +01:00
ba8b57050d
Bump sass from 1.58.0 to 1.58.2 ( #23658 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-17 09:52:30 +01:00
630975bf41
New Crowdin updates ( #23527 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-16 10:23:03 +09:00
520c73c12f
Bump babel-jest from 29.4.1 to 29.4.2 ( #23583 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:44:26 +01:00
6f34fdcd86
Bump jest-environment-jsdom from 29.4.1 to 29.4.2 ( #23582 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:35:10 +01:00
a4f22e4343
Bump jest from 29.4.1 to 29.4.2 ( #23585 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:27:24 +01:00
526361a5e9
Bump prettier from 2.8.3 to 2.8.4 ( #23584 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:14:29 +01:00
cfad64daeb
Bump webpack-bundle-analyzer from 4.7.0 to 4.8.0 ( #23581 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:14:10 +01:00
64f9ced09f
Bump axios from 1.3.2 to 1.3.3 ( #23580 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:12:41 +01:00
14ad013f5e
Bump ws from 8.12.0 to 8.12.1 ( #23579 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:12:21 +01:00
93e36c0d55
Bump stylelint-config-standard-scss from 7.0.0 to 7.0.1 ( #23578 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-14 09:12:14 +01:00
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
0c9d455ea5
Upgrade to Stylelint 15 with Prettier ( #23558 )
2023-02-13 04:57:03 +01:00
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
08001e387b
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
f31d9a590d
Bump sass from 1.57.1 to 1.58.0 ( #23421 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.57.1 to 1.58.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.57.1...1.58.0 )
---
updated-dependencies:
- dependency-name: sass
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 00:41:07 +09:00
1e2f839543
Bump immutable from 4.2.2 to 4.2.4 ( #23419 )
...
Bumps [immutable](https://github.com/immutable-js/immutable-js ) from 4.2.2 to 4.2.4.
- [Release notes](https://github.com/immutable-js/immutable-js/releases )
- [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md )
- [Commits](https://github.com/immutable-js/immutable-js/compare/v4.2.2...v4.2.4 )
---
updated-dependencies:
- dependency-name: immutable
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-08 00:40:15 +09:00
8651ef751e
New Crowdin updates ( #23356 )
...
* New translations en.json (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Finnish)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Esperanto)
* New translations en.json (French)
* New translations en.json (French)
* New translations en.yml (French)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Esperanto)
* 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.json (Korean)
* New translations en.json (French)
* New translations en.json (French)
* New translations simple_form.en.yml (French)
* New translations en.json (French)
* New translations en.yml (Danish)
* New translations en.yml (Slovak)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (English, United Kingdom)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Dutch)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Afrikaans)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Belarusian)
* New translations simple_form.en.yml (Czech)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations en.json (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovenian)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Swedish)
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Vietnamese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Indonesian)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Thai)
* New translations simple_form.en.yml (Croatian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Latvian)
* New translations simple_form.en.yml (Malay)
* New translations simple_form.en.yml (Faroese)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (French, Quebec)
* New translations simple_form.en.yml (Sinhala)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Aragonese)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Scots)
* New translations simple_form.en.yml (Corsican)
* New translations simple_form.en.yml (Sardinian)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Korean)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations simple_form.en.yml (Korean)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Chinese Simplified)
* New translations simple_form.en.yml (Spanish, Mexico)
* Normalize
---------
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-02-04 15:46:08 +09:00
aeacebb3d7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream updated `docker/build-push-action`, and we a different config
for `docker/metadata-action` so the lines directly above were different,
but it's not a real conflict.
Upgraded `docker/build-push-action` as upstream did.
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Upstream changed the codestyle near a line we had modified to accommodate
configurable character count.
Kept our change.
2023-02-03 19:23:27 +01:00
e79babe6a3
Bump jest-environment-jsdom from 29.3.1 to 29.4.1 ( #23329 )
...
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom ) from 29.3.1 to 29.4.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v29.4.1/packages/jest-environment-jsdom )
---
updated-dependencies:
- dependency-name: jest-environment-jsdom
dependency-type: direct:development
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-01 11:53:54 +01:00
Claire
Nick Schonning
dependabot[bot]
Ramūns Usovs
Shlee
Eugen Rochko