tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,854 Commits 10 Branches 0 Tags
d4f13b90419b604c84d9a89635c5ea09be81d6cc
Commit Graph

15854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
978dd7e73c Merge pull request #1830 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-08-25 19:30:24 +02:00
Claire
d99f91bceb [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list 
Port 55bef1e34f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 18:19:09 +02:00
Claire
43a1bfd05d [Glitch] Fix “Filter this post” potentially listing deleted filters 
Port 2cae5f5b8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 18:18:34 +02:00
Claire
3ff340c790 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 17:49:14 +02:00
Claire
55bef1e34f Fix quickly switching notification filters resulting in empty or incorrect list (#19052) 
Follow-up to #18960

The aforementioned PR fixed an issue in which switching notification filters
while notifications were loading prevented the query for the new filter from
running, but another issue remained: if the first query completed after the
second one, its results would override the second one, thus leading to the
same issue.

This commit cancels the first request if it is still running, before issuing
the second one.
 2022-08-25 17:36:54 +02:00
Claire
2cae5f5b8d Fix “Filter this post” potentially listing deleted filters (#19051) 2022-08-25 17:36:35 +02:00
Claire
63adef2021 Change wording of a few filter-related strings (#19050) 
Follow-up on #18945 addressing review comments
 2022-08-25 17:36:01 +02:00
Claire
acc580fb7d Merge pull request #1829 from ClearlyClaire/glitch-soc/merge-upstream 
Port UI filter changes from upstream
 2022-08-25 14:12:44 +02:00
Eugen Rochko
3efa8da2d6 New Crowdin updates (#18972) 
* New translations en.json (Hindi)

* New translations en.json (Malay)

* New translations en.json (Telugu)

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

* New translations en.json (Uyghur)

* New translations en.json (Standard Moroccan Tamazight)

* New translations en.json (Dutch)

* New translations en.json (Portuguese)

* New translations en.json (Ukrainian)

* New translations en.json (Chinese Traditional)

* New translations en.json (Chinese Simplified)

* New translations en.json (Danish)

* New translations en.json (Spanish, Argentina)

* New translations en.json (Korean)

* New translations en.json (Catalan)

* New translations en.json (Hungarian)

* New translations en.json (Slovenian)

* New translations en.json (Galician)

* New translations en.json (Greek)

* New translations en.json (Polish)

* New translations en.json (Turkish)

* New translations devise.en.yml (Turkish)

* New translations doorkeeper.en.yml (Turkish)

* New translations en.json (Albanian)

* New translations en.json (Swedish)

* New translations en.json (Turkish)

* New translations en.json (Icelandic)

* New translations en.json (Latvian)

* New translations en.json (Spanish)

* New translations en.json (German)

* New translations en.json (Italian)

* New translations en.json (Ido)

* New translations en.json (Russian)

* New translations en.json (Vietnamese)

* New translations en.yml (Esperanto)

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.json (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations simple_form.en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.yml (Finnish)

* New translations en.json (Thai)

* New translations en.json (Russian)

* New translations en.json (Chinese Simplified)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations en.json (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Turkish)

* 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 (Slovak)

* 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 (Ukrainian)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Vietnamese)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Portuguese, Brazilian)

* 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 (Dutch)

* New translations simple_form.en.yml (Czech)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Norwegian Nynorsk)

* New translations simple_form.en.yml (Romanian)

* New translations simple_form.en.yml (French)

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Afrikaans)

* New translations simple_form.en.yml (Arabic)

* New translations simple_form.en.yml (Bulgarian)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (Korean)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Frisian)

* New translations simple_form.en.yml (Basque)

* 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 simple_form.en.yml (Japanese)

* New translations simple_form.en.yml (Georgian)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Asturian)

* New translations simple_form.en.yml (Occitan)

* New translations simple_form.en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Corsican)

* New translations simple_form.en.yml (Breton)

* 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 (Sinhala)

* New translations simple_form.en.yml (Malayalam)

* 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 (Kazakh)

* New translations simple_form.en.yml (Estonian)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Tatar)

* New translations simple_form.en.yml (Welsh)

* New translations simple_form.en.yml (Esperanto)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Thai)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Spanish)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Greek)

* New translations simple_form.en.yml (Hungarian)

* New translations simple_form.en.yml (Portuguese)

* New translations simple_form.en.yml (Icelandic)

* New translations simple_form.en.yml (Thai)

* New translations simple_form.en.yml (Latvian)

* New translations simple_form.en.yml (Danish)

* New translations simple_form.en.yml (German)

* New translations simple_form.en.yml (Catalan)

* New translations simple_form.en.yml (Italian)

* New translations simple_form.en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* New translations simple_form.en.yml (Russian)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Korean)

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Albanian)

* New translations en.yml (Korean)

* New translations en.yml (Lithuanian)

* New translations en.yml (Macedonian)

* New translations en.yml (Dutch)

* New translations en.yml (Norwegian)

* New translations en.yml (Punjabi)

* New translations en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.yml (Slovenian)

* New translations en.yml (Serbian (Cyrillic))

* New translations en.yml (Italian)

* New translations en.yml (Swedish)

* New translations en.yml (Turkish)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Urdu (Pakistan))

* New translations en.yml (Vietnamese)

* New translations en.yml (Galician)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Georgian)

* New translations en.yml (Armenian)

* New translations en.yml (Spanish)

* New translations en.yml (Japanese)

* New translations en.yml (German)

* New translations en.yml (Russian)

* New translations en.yml (Slovak)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Romanian)

* New translations en.yml (French)

* New translations en.yml (Afrikaans)

* New translations en.yml (Hungarian)

* New translations en.yml (Arabic)

* New translations en.yml (Bulgarian)

* New translations en.yml (Catalan)

* New translations en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Greek)

* New translations en.yml (Frisian)

* New translations en.yml (Basque)

* New translations en.yml (Irish)

* New translations en.yml (Hebrew)

* New translations en.yml (Persian)

* New translations en.yml (Tamil)

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Cornish)

* New translations en.yml (Kannada)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Asturian)

* New translations en.yml (Occitan)

* New translations en.yml (Serbian (Latin))

* New translations en.yml (Corsican)

* New translations en.yml (Breton)

* New translations en.yml (Sardinian)

* New translations en.yml (Sanskrit)

* New translations en.yml (Kabyle)

* New translations en.yml (Ido)

* New translations en.yml (Taigi)

* New translations en.yml (Silesian)

* New translations en.yml (Sinhala)

* New translations en.yml (Malayalam)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Latvian)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Bengali)

* New translations en.yml (Marathi)

* New translations en.yml (Croatian)

* New translations en.yml (Kazakh)

* New translations en.yml (Estonian)

* New translations en.yml (Hindi)

* New translations en.yml (Tatar)

* New translations en.yml (Malay)

* New translations en.yml (Telugu)

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

* New translations en.yml (Welsh)

* New translations en.yml (Uyghur)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Galician)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Swedish)

* New translations en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Slovenian)

* New translations en.yml (Polish)

* New translations en.yml (Slovenian)

* New translations en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Turkish)

* New translations en.yml (Polish)

* New translations en.yml (Turkish)

* New translations simple_form.en.yml (Vietnamese)

* New translations en.yml (Spanish)

* New translations en.yml (Danish)

* New translations en.yml (Korean)

* New translations en.yml (Vietnamese)

* New translations en.yml (Icelandic)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-08-25 19:40:19 +09:00
Claire
2b03e21d36 Fix glitch-soc-specific timeline filtering logic 2022-08-25 11:53:16 +02:00
Claire
3844f15da0 Remove obsolete filter local settings 2022-08-25 09:52:13 +02:00
Claire
0b733ca790 [Glitch] Add ability to filter individual posts 
Port 50487db122 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 09:52:13 +02:00
Takeshi Umeda
28f0dfc0b4 [Glitch] Fix case where boolean was passed to onFilter on StatusActionBar 
Port 66b8abf218 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 09:52:13 +02:00
Claire
93b6ad2c6c [Glitch] Remove dead code in WebUI filtering code 
Port a233a9bfb5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 09:52:13 +02:00
Claire
bbafe28fbc [Glitch] Fix reblogged statuses being erroneously shown as filtered 
Port 3c24f19afe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 09:52:13 +02:00
Claire
a15fe32e61 [Glitch] Revamp post filtering system 
Port front-end changes from 02851848e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 09:40:45 +02:00
Claire
4be626734d Merge pull request #1827 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-08-25 06:15:55 +02:00
Claire
448ed92f76 [Glitch] Fix quickly switching notification filters resulting in empty or incorrect list 
Port afb8bc97d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 05:16:43 +02:00
Claire
3c80b62045 [Glitch] Fix media modal link button 
Port ba745ca99a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 05:14:00 +02:00
Takeshi Umeda
68564a622c [Glitch] Fix action type for unfollowHashtag 
Port 5d70a16a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-25 05:11:55 +02:00
Claire
2d1d4210f9 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-25 05:07:39 +02:00
Jeong Arm
861b35dd54 Support "http_hidden_proxy" ENV var for hidden service only proxy (#18427) 
* Support "http_hidden_proxy" ENV var for hidden service only proxy

* Fallback to http_proxy if http_hidden_proxy is not set
 2022-08-25 04:41:14 +02:00
James Smith
1165943968 Mark job pods not to use Istio's envoy sidecar (#18415) 
* Mark job pods not to use Istio's envoy sidecar

Istio injects sidecars into pods to implement mTLS between pods. Jobs
usually don't know about this, so they don't signal the Envoy process
to stop when the job finishes. Since at least one process is running
in the pod, Kubernetes doesn't consider the job to be completed, so it
lingers.

By adding the `sidecar.istio.io/inject` annotation set to `"false"`,
we let Istio know that it should not inject the sidecar. If Istio is
not installed, then this has no impact.

* Support arbitrary job annotations in the Helm chart

Rather than focus on Istio, this allows arbitrary annotations for job pods.

* Add in-line documentation for pod/job annotations
 2022-08-25 04:40:38 +02:00
Jeong Arm
e682975afd Add '--days' option to tootctl media refresh (#18425) 
* Add '--days' option to tootctl media refresh

* Fix undefined scope
 2022-08-25 04:40:17 +02:00
Alex Nordlund
63a5514b29 Allow S3 to use an existing secret (#18997) 2022-08-25 04:39:11 +02:00
Jeong Arm
42ff4dce41 Use type="color" on badge color input field (#18825) 
This informs browser to use interactive color picker
 2022-08-25 04:38:34 +02:00
Takeshi Umeda
5d70a16a14 Fix action type for unfollowHashtag (#18924) 2022-08-25 04:38:01 +02:00
Takeshi Umeda
66b8abf218 Fix case where boolean was passed to onFilter on StatusActionBar (#18923) 2022-08-25 04:37:40 +02:00
Arya K
af9c9936dd Fix I2P HTTPS redirect (#18929) 2022-08-25 04:37:09 +02:00
Claire
8479a4b0c1 Fix tests with regards to upcoming immutable PKeys in OpenSSL 3 (#18464) 2022-08-25 04:32:45 +02:00
Claire
03241d884e Add option for EMAIL_DOMAIN_DENYLIST/EMAIL_DOMAIN_ALLOWLIST to apply after confirmation (#18642) 
Fixes #18620
 2022-08-25 04:31:10 +02:00
Claire
ba745ca99a Fix media modal link button (#18877) 
Fixes regression from #18697
 2022-08-25 04:30:53 +02:00
Claire
19f2f35b33 Fix filtering on context mismatch (#18956) 2022-08-25 04:29:20 +02:00
Claire
afb8bc97d0 Fix quickly switching notification filters resulting in empty or incorrect list (#18960) 2022-08-25 04:29:00 +02:00
Claire
50487db122 Add ability to filter individual posts (#18945) 
* Add database table for status-specific filters

* Add REST endpoints, entities and attributes

* Show status filters in /filters interface

* Perform server-side filtering for individual posts filters

* Fix filtering on context mismatch

* Refactor `toServerSideType` by moving it to its own module

* Move loupe and delete icons to their own module

* Add ability to filter individual posts from WebUI

* Replace keyword list by warnings (expired, context mismatch)

* Refactor server-side filtering code

* Add tests
 2022-08-25 04:27:47 +02:00
dependabot[bot]
d156e9b823 Bump stylelint from 14.10.0 to 14.11.0 (#19034) 
Bumps [stylelint](https://github.com/stylelint/stylelint) from 14.10.0 to 14.11.0.
- [Release notes](https://github.com/stylelint/stylelint/releases)
- [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/stylelint/stylelint/compare/14.10.0...14.11.0)

---
updated-dependencies:
- dependency-name: stylelint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 09:58:04 +09:00
dependabot[bot]
115b8311c1 Bump sidekiq from 6.5.4 to 6.5.5 (#19030) 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.4 to 6.5.5.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.4...v6.5.5)

---
updated-dependencies:
- dependency-name: sidekiq
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 09:57:16 +09:00
dependabot[bot]
26a1d1ac5f Bump webpack-bundle-analyzer from 4.5.0 to 4.6.1 (#19029) 
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer) from 4.5.0 to 4.6.1.
- [Release notes](https://github.com/webpack-contrib/webpack-bundle-analyzer/releases)
- [Changelog](https://github.com/webpack-contrib/webpack-bundle-analyzer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/webpack-bundle-analyzer/compare/v4.5.0...v4.6.1)

---
updated-dependencies:
- dependency-name: webpack-bundle-analyzer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 09:56:16 +09:00
dependabot[bot]
37de05fdde Bump sass from 1.54.4 to 1.54.5 (#19028) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.54.4 to 1.54.5.
- [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.54.4...1.54.5)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 09:55:34 +09:00
dependabot[bot]
ca55361671 Bump @babel/core from 7.18.10 to 7.18.13 (#19032) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.18.10 to 7.18.13.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.18.13/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 09:55:01 +09:00
dependabot[bot]
b21aa82803 Bump stackprof from 0.2.20 to 0.2.21 (#19027) 
Bumps [stackprof](https://github.com/tmm1/stackprof) from 0.2.20 to 0.2.21.
- [Release notes](https://github.com/tmm1/stackprof/releases)
- [Changelog](https://github.com/tmm1/stackprof/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tmm1/stackprof/compare/v0.2.20...v0.2.21)

---
updated-dependencies:
- dependency-name: stackprof
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-25 09:54:36 +09:00
Eugen Rochko
0412a4d03e Change e-mail domain blocks to match subdomains of blocked domains (#18979) 2022-08-24 19:00:55 +02:00
Eugen Rochko
d83faa1a89 Add ability to block sign-ups from IP (#19037) 2022-08-24 19:00:37 +02:00
Claire
5a3d09dc8e Merge pull request #1826 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-08-21 15:42:50 +02:00
Shlee
8a93dd3d83 [Glitch] Update notifications.js 
Port d92ce31c92 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-08-21 14:44:58 +02:00
Claire
0b37299775 Merge branch 'main' into glitch-soc/merge-upstream 2022-08-21 14:39:25 +02:00
dependabot[bot]
5920d8fe33 Bump omniauth from 1.9.1 to 1.9.2 (#19006) 
Bumps [omniauth](https://github.com/omniauth/omniauth) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/omniauth/omniauth/releases)
- [Commits](https://github.com/omniauth/omniauth/compare/v1.9.1...v1.9.2)

---
updated-dependencies:
- dependency-name: omniauth
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-19 18:53:42 +09:00
dependabot[bot]
a6dc606d52 Bump webmock from 3.17.0 to 3.18.1 (#19007) 
Bumps [webmock](https://github.com/bblimke/webmock) from 3.17.0 to 3.18.1.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v3.17.0...v3.18.1)

---
updated-dependencies:
- dependency-name: webmock
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-19 09:27:53 +09:00
dependabot[bot]
1254fa122f Bump cocoon-js-vanilla from 1.2.0 to 1.3.0 (#18991) 
Bumps cocoon-js-vanilla from 1.2.0 to 1.3.0.

---
updated-dependencies:
- dependency-name: cocoon-js-vanilla
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-19 09:24:46 +09:00
dependabot[bot]
99f6be3b60 Bump pg from 1.4.2 to 1.4.3 (#18986) 
Bumps [pg](https://github.com/ged/ruby-pg) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/ged/ruby-pg/releases)
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc)
- [Commits](https://github.com/ged/ruby-pg/compare/v1.4.2...v1.4.3)

---
updated-dependencies:
- dependency-name: pg
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-08-19 09:06:15 +09:00