luzpaz
898fe2fa8e
Fix typo in source `setted`->`set` ( #18385 )
...
Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`
2022-05-10 04:58:04 +02:00
Claire
662ed53c18
Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Fixes #601
2022-05-09 23:20:19 +02:00
Claire
f714e24ff1
Fix redis configuration not being changed by mastodon:setup ( #18383 )
...
Fixes #18342
2022-05-09 23:19:11 +02:00
Eugen Rochko
2b8dc58b7f
Change RSS feeds ( #18356 )
...
* Change RSS feeds
- Use date and time for titles instead of ellipsized text
- Use full content in body, even when there is a content warning
- Use media extensions
* Change feed icons and add width and height attributes to custom emojis
* Fix custom emoji animate on hover breaking
* Fix tests
2022-05-09 07:43:08 +02:00
Claire
e8b8ac8908
Merge pull request #1766 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-05-08 21:45:59 +02:00
Claire
dc1685c1e6
[Glitch] Fix streaming notifications not using quick filter logic
...
Port f17e73da09
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:56 +02:00
Claire
703c7ae4b9
[Glitch] Fix floating action button obscuring last element
...
Port 5a448d0d71
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-08 21:05:21 +02:00
Claire
22080786df
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-08 21:00:49 +02:00
Jeong Arm
d7eae4229c
Update Korean translation ( #1765 )
2022-05-07 16:56:08 +02:00
Claire
f17e73da09
Fix streaming notifications not using quick filter logic ( #18316 )
...
Fixes #18309
The quickFilter logic was used on display and to request new notification
pages, but not for live updates. The main issue this caused is bump the unread
notifications count regardless of the quickFilter setting.
Since notifications are re-fetched when changing quickFilter settings, it is
safe to drop live notifications that do not match the selected filter.
2022-05-07 04:50:40 +02:00
Claire
991353682d
Fix ambiguous wording on appeal actions ( #18328 )
...
Fixes #18322
2022-05-06 21:41:34 +02:00
Claire
5a448d0d71
Fix floating action button obscuring last element ( #18332 )
...
Fixes #18331
Add some padding below the last element of scrollable lists when the FAB is
shown in order for users to always be able to fully see the last element.
2022-05-06 21:40:49 +02:00
Claire
a53003c6f1
Fix account warnings not being recorded in audit log ( #18338 )
...
* Fix account warnings not being recorded in audit log
Fixes #18334
* Only record warnings if they are not associated to another action
2022-05-06 21:40:20 +02:00
Eugen Rochko
9250578e6b
New Crowdin updates ( #18255 )
...
* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)
* New translations doorkeeper.en.yml (Tatar)
* New translations doorkeeper.en.yml (Malayalam)
* New translations doorkeeper.en.yml (Breton)
* New translations doorkeeper.en.yml (Sinhala)
* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Chinese Traditional)
* New translations en.json (Catalan)
* New translations en.json (Japanese)
* New translations en.json (French)
* New translations en.json (Spanish)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Korean)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Korean)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.json (Vietnamese)
* New translations en.json (Turkish)
* New translations en.json (Galician)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
* Add whitelist_en-GB.json [ci skip]
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Swedish)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Greek)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Ukrainian)
* New translations en.json (Thai)
* New translations en.yml (Hebrew)
* New translations en.yml (Ukrainian)
* New translations en.json (Polish)
* New translations en.json (Ukrainian)
* New translations doorkeeper.en.yml (Ukrainian)
* New translations en.json (Thai)
* New translations en.yml (Hebrew)
* New translations en.yml (Ukrainian)
* New translations en.json (Danish)
* New translations en.json (Hebrew)
* New translations en.json (Ido)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Danish)
* New translations en.json (Ido)
* New translations en.yml (Hebrew)
* New translations doorkeeper.en.yml (Hebrew)
* New translations en.json (Ido)
* New translations en.yml (Hebrew)
* New translations en.yml (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.yml (Hebrew)
* New translations en.json (Afrikaans)
* New translations en.json (Hebrew)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Hebrew)
* New translations en.json (Slovenian)
* New translations en.json (Ukrainian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Hebrew)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (German)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Russian)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Icelandic)
* New translations simple_form.en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Hungarian)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations en.yml (Hebrew)
* New translations en.json (Czech)
* New translations en.yml (Hebrew)
* New translations en.json (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Hebrew)
* New translations en.json (Spanish)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.json (Portuguese)
* New translations en.yml (Hebrew)
* New translations en.yml (Japanese)
* New translations simple_form.en.yml (Japanese)
* New translations doorkeeper.en.yml (Japanese)
* New translations en.json (Danish)
* New translations activerecord.en.yml (Japanese)
* New translations en.yml (Hebrew)
* New translations en.yml (Slovenian)
* New translations en.json (Welsh)
* New translations en.yml (Slovenian)
* New translations en.json (Italian)
* New translations en.yml (Slovenian)
* New translations en.json (Indonesian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Thai)
* New translations en.yml (Thai)
* New translations en.yml (Slovenian)
* New translations en.yml (Danish)
* New translations en.json (Swedish)
* New translations en.yml (Slovenian)
* New translations en.json (Vietnamese)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Welsh)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Slovenian)
* New translations en.yml (Welsh)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Danish)
* New translations en.yml (Slovenian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Slovenian)
* New translations en.json (Portuguese, Brazilian)
* New translations en.json (Slovenian)
* New translations doorkeeper.en.yml (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.yml (Slovenian)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Slovenian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Slovenian)
* New translations simple_form.en.yml (Slovenian)
* New translations en.json (Welsh)
* New translations en.json (French)
* New translations en.json (Welsh)
* New translations en.json (French)
* New translations en.yml (Arabic)
* New translations en.json (Arabic)
* New translations simple_form.en.yml (Welsh)
* New translations en.json (French)
* New translations simple_form.en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (German)
* New translations en.yml (Ukrainian)
* New translations en.json (Ukrainian)
* New translations en.yml (Hebrew)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.yml (Hebrew)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Arabic)
* New translations en.json (Asturian)
* New translations en.yml (Thai)
* New translations en.json (Thai)
* New translations en.json (German)
* New translations en.json (Ido)
* New translations en.json (Welsh)
* New translations en.json (Ido)
* New translations en.json (Welsh)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.yml (Catalan)
* New translations en.json (Catalan)
* New translations en.json (German)
* New translations en.json (Albanian)
* New translations en.json (German)
* New translations en.yml (German)
* New translations en.json (German)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-06 21:53:22 +09:00
Stefano Pigozzi
99d7684dfd
Replace leftover `envelope` icons with `at` icons ( #18305 )
2022-05-06 00:41:56 +02:00
Sara Golemon
336c23336a
Allow VerifyLinkService to accept backlinks with differing case ( #18320 )
2022-05-06 00:41:42 +02:00
Jeremy Kescher
c58c13822a
Fix incorrect upload size limit at /admin/custom_emojis/new in glitch-soc ( #1763 )
2022-05-05 19:11:56 +02:00
Claire
8481fa7f6a
Merge pull request #1762 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-05-04 20:32:12 +02:00
Claire
c85c3fb708
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream updated `jest`, moving its config in a separate file.
This config was modified in glitch-soc, so the corresponding changes have
been ported to `jest.config.js`
2022-05-04 19:15:50 +02:00
dependabot[bot]
db01df2dda
Bump sidekiq-scheduler from 3.2.0 to 4.0.0 ( #18275 )
...
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler ) from 3.2.0 to 4.0.0.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases )
- [Changelog](https://github.com/moove-it/sidekiq-scheduler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v3.2.0...v4.0.0 )
---
updated-dependencies:
- dependency-name: sidekiq-scheduler
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-04 22:47:05 +09:00
dependabot[bot]
39820a940f
Bump glob from 7.2.0 to 8.0.1 ( #18013 )
...
Bumps [glob](https://github.com/isaacs/node-glob ) from 7.2.0 to 8.0.1.
- [Release notes](https://github.com/isaacs/node-glob/releases )
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md )
- [Commits](https://github.com/isaacs/node-glob/compare/v7.2.0...v8.0.1 )
---
updated-dependencies:
- dependency-name: glob
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-04 22:38:02 +09:00
dependabot[bot]
8f4d7f54f8
Bump stoplight from 2.2.1 to 3.0.0 ( #17645 )
...
Bumps [stoplight](https://github.com/orgsync/stoplight ) from 2.2.1 to 3.0.0.
- [Release notes](https://github.com/orgsync/stoplight/releases )
- [Changelog](https://github.com/bolshakov/stoplight/blob/master/CHANGELOG.md )
- [Commits](https://github.com/orgsync/stoplight/compare/v2.2.1...v3.0.0 )
---
updated-dependencies:
- dependency-name: stoplight
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-04 22:33:19 +09:00
dependabot[bot]
132239008d
Bump redux from 4.1.2 to 4.2.0 ( #18087 )
...
Bumps [redux](https://github.com/reduxjs/redux ) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/reduxjs/redux/releases )
- [Changelog](https://github.com/reduxjs/redux/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/redux/compare/v4.1.2...v4.2.0 )
---
updated-dependencies:
- dependency-name: redux
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>
2022-05-04 22:29:51 +09:00
dependabot[bot]
8a6b796440
Bump axios from 0.26.1 to 0.27.2 ( #18270 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.26.1 to 0.27.2.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.26.1...v0.27.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>
2022-05-04 22:25:40 +09:00
dependabot[bot]
8c644dcbd9
Bump jest from 27.5.1 to 28.0.3 ( #18280 )
...
* Bump jest from 27.5.1 to 28.0.3
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest ) from 27.5.1 to 28.0.3.
- [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/v28.0.3/packages/jest )
---
updated-dependencies:
- dependency-name: jest
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Bump babel-jest from 27.5.1 to 28.0.3
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.5.1 to 28.0.3.
- [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/v28.0.3/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
* Add jest-environment-jsdom
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-04 14:06:49 +09:00
dependabot[bot]
c08bc2da61
Bump ws from 8.5.0 to 8.6.0 ( #18279 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.5.0 to 8.6.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.5.0...8.6.0 )
---
updated-dependencies:
- dependency-name: ws
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>
2022-05-04 13:55:05 +09:00
dependabot[bot]
f18c620d4b
Bump brakeman from 5.2.2 to 5.2.3 ( #18274 )
...
Bumps [brakeman](https://github.com/presidentbeef/brakeman ) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/presidentbeef/brakeman/releases )
- [Changelog](https://github.com/presidentbeef/brakeman/blob/main/CHANGES.md )
- [Commits](https://github.com/presidentbeef/brakeman/compare/v5.2.2...v5.2.3 )
---
updated-dependencies:
- dependency-name: brakeman
dependency-type: direct:development
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>
2022-05-04 13:49:53 +09:00
dependabot[bot]
881d71e58c
Bump rubocop from 1.27.0 to 1.28.2 ( #18084 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.27.0 to 1.28.2.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.27.0...v1.28.2 )
---
updated-dependencies:
- dependency-name: rubocop
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>
2022-05-04 13:43:02 +09:00
dependabot[bot]
381415bd97
Bump redis from 4.0.6 to 4.1.0 ( #18282 )
...
Bumps [redis](https://github.com/redis/node-redis ) from 4.0.6 to 4.1.0.
- [Release notes](https://github.com/redis/node-redis/releases )
- [Changelog](https://github.com/redis/node-redis/blob/master/CHANGELOG.md )
- [Commits](https://github.com/redis/node-redis/compare/redis@4.0.6...redis@4.1.0 )
---
updated-dependencies:
- dependency-name: redis
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>
2022-05-04 13:42:37 +09:00
rinsuki
6e736f2452
fix: embed.js doesn't expands iframes height ( #18301 )
...
also including some refactoring:
- add `// @ts-check`
- use Map to completely avoid prototype pollution
- assign random id to each iframe for reduce chance to brute-force attack, and leak of iframe counts
- check iframe.contentWindow and MessageEvent.source to validate message is coming from correct iframe (it works on latest Chrome/Firefox/Safari but I'm not sure this is allowed by spec)
follow-up of #17420
fix #18299
2022-05-04 03:20:44 +02:00
mayaeh
a01580f09f
Update translation strings for direct message ( #18300 )
2022-05-04 02:40:26 +02:00
Claire
014065913c
Bump version to 3.5.2 ( #18295 )
...
* Bump version to 3.5.2
* Change some entries to be more clear
* Add some extra notes
* Fix line wrap
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2022-05-04 00:57:42 +02:00
Claire
340fa34513
Bump minimum Ruby version ( #18294 )
...
Mastodon has been incompatible with Ruby 2.5 for a few releases due to
some dependencies, this just updates the Gemfile description to match
that situation.
2022-05-04 00:26:46 +02:00
Claire
e2d1d3b428
Change “Only people I mention” to “Mentioned people only” ( #18291 )
2022-05-03 12:30:40 +02:00
Claire
58ac5ae643
Merge pull request #1761 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-05-03 12:05:24 +02:00
Claire
fa22b8ed22
Move DM conversation/timeline tab to column settings switch
2022-05-03 11:45:23 +02:00
Claire
3dd4f40a0e
Fix backend terms link not being used
2022-05-03 11:10:58 +02:00
Claire
3093ed1b7d
Refactor visibility icon using VisibilityIcon
2022-05-03 11:04:09 +02:00
Claire
e4bec702ac
[Glitch] Rename toots to posts in various places, add or reword DM warnings
...
Port part of be0bc9acbf
and 7e244879fe
to glitch-soc
2022-05-03 10:59:23 +02:00
Claire
3869daef09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Not really a conflict, upstream updated a dependency textually adjacent to a
glitch-soc-only one.
Updated the dependency as upstream did.
2022-05-03 10:16:49 +02:00
Eugen Rochko
7e244879fe
Change "Conversations" back to "Direct messages" and add warning in web UI ( #18289 )
...
Partially reverts #18146
2022-05-03 09:09:09 +02:00
dependabot[bot]
aed1c47cb1
Bump sass from 1.50.1 to 1.51.0 ( #18285 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.50.1 to 1.51.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.50.1...1.51.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>
2022-05-03 10:41:21 +09:00
dependabot[bot]
a6508d652b
Bump react-select from 5.3.0 to 5.3.1 ( #18273 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/JedWatson/react-select/releases )
- [Changelog](https://github.com/JedWatson/react-select/blob/master/docs/CHANGELOG.md )
- [Commits](https://github.com/JedWatson/react-select/compare/react-select@5.3.0...react-select@5.3.1 )
---
updated-dependencies:
- dependency-name: react-select
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>
2022-05-03 10:40:48 +09:00
dependabot[bot]
d96000bd31
Bump express from 4.18.0 to 4.18.1 ( #18271 )
...
Bumps [express](https://github.com/expressjs/express ) from 4.18.0 to 4.18.1.
- [Release notes](https://github.com/expressjs/express/releases )
- [Changelog](https://github.com/expressjs/express/blob/master/History.md )
- [Commits](https://github.com/expressjs/express/compare/4.18.0...4.18.1 )
---
updated-dependencies:
- dependency-name: express
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>
2022-05-03 10:40:18 +09:00
dependabot[bot]
80da658069
Bump @babel/preset-env from 7.16.11 to 7.17.10 ( #18281 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.11 to 7.17.10.
- [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.17.10/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
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>
2022-05-03 10:30:14 +09:00
dependabot[bot]
ce2449421c
Bump rails from 6.1.5 to 6.1.5.1 ( #18276 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.5 to 6.1.5.1.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.5...v6.1.5.1 )
---
updated-dependencies:
- dependency-name: rails
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>
2022-05-03 10:22:05 +09:00
dependabot[bot]
5bfdc11fb9
Bump babel-loader from 8.2.4 to 8.2.5 ( #18096 )
...
Bumps [babel-loader](https://github.com/babel/babel-loader ) from 8.2.4 to 8.2.5.
- [Release notes](https://github.com/babel/babel-loader/releases )
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel-loader/compare/v8.2.4...v8.2.5 )
---
updated-dependencies:
- dependency-name: babel-loader
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>
2022-05-03 10:20:22 +09:00
dependabot[bot]
3cc0233adc
Bump @babel/plugin-transform-runtime from 7.17.0 to 7.17.10 ( #18283 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.17.0 to 7.17.10.
- [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.17.10/packages/babel-plugin-transform-runtime )
---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
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>
2022-05-03 10:19:40 +09:00
dependabot[bot]
9723b768c5
Bump @babel/core from 7.17.9 to 7.17.10 ( #18277 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.17.9 to 7.17.10.
- [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.17.10/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>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-03 10:19:24 +09:00
dependabot[bot]
5a8a6a1e8c
Bump rspec-rails from 5.1.1 to 5.1.2 ( #18092 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.1.1...v5.1.2 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
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>
2022-05-03 10:11:42 +09:00