Claire
c279dbd470
Merge pull request #1778 from ClearlyClaire/glitch-soc/fixes/code-block-indentation
...
Fix leading spaces being stripped in Markdown code blocks
2022-05-24 12:11:56 +02:00
Claire
55ba907108
Add test
2022-05-24 10:26:04 +02:00
Claire
fe65c0e44f
Fix leading spaces being stripped in Markdown code blocks
...
Fixes #1776
2022-05-24 10:24:59 +02:00
Claire
06de3a17f8
Merge pull request #1775 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-05-17 10:44:41 +02:00
Claire
b3ea262e40
Merge branch 'main' into glitch-soc/merge-upstream
2022-05-17 10:13:32 +02:00
Yamagishi Kazutoshi
c78a622ba4
Prevent update to redis 4.1.0 ( #18444 )
2022-05-17 10:12:00 +02:00
Eugen Rochko
2e5fb45be5
[Glitch] Add language dropdown to compose in web UI
...
Port 0cdb077570
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-16 23:06:29 +02:00
Claire
4415005de7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.js`:
Conflict caused because of minor code style change upstream, while glitch-soc
has different code for handling variable maximum chars.
Ported the change.
- `app/serializers/initial_state_serializer.rb`:
Conflict because glitch-soc had two extra attributes where upstream added
one.
Added upstream's attribute.
2022-05-16 22:29:05 +02:00
Eugen Rochko
d25015fc5b
Revert "Bump redis from 4.0.6 to 4.1.0" ( #18430 )
2022-05-16 20:14:20 +02:00
Eugen Rochko
6c699b1723
Fix preferred posting language returning unusable value in REST API ( #18428 )
2022-05-16 19:13:36 +02:00
Claire
b91196f4b7
Add confirmation page when importing blocked domains ( #1773 )
...
* Move glitch-soc-specific strings to glitch-soc-specific locale files
* Add confirmation page when importing blocked domains
2022-05-16 18:26:49 +02:00
Eugen Rochko
0cdb077570
Add language dropdown to compose in web UI ( #18420 )
2022-05-16 11:18:35 +02:00
Claire
3a08411306
Merge pull request #1772 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-05-16 10:43:44 +02:00
Claire
040b7d37a4
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/remove_status_service.rb`:
Conflict due to glitch-soc having extra code for a proper direct visibility
timeline, in a part of the code upstream refactored.
Restored glitch-soc's extra code in the refactored bit.
2022-05-16 09:42:32 +02:00
Levi Bard
94e98864e3
Allow import/export of instance-level domain blocks/allows ( #1754 )
...
* Allow import/export of instance-level domain blocks/allows.
Fixes #15095
* Pacify circleci
* Address simple code review feedback
* Add headers to exported CSV
* Extract common import/export functionality to
AdminExportControllerConcern
* Add additional fields to instance-blocked domain export
* Address review feedback
* Split instance domain block/allow import/export into separate pages/controllers
* Address code review feedback
* Pacify DeepSource
* Work around Paperclip::HasAttachmentFile for Rails 6
* Fix deprecated API warning in export tests
* Remove after_commit workaround
2022-05-16 09:29:01 +02:00
Yamagishi Kazutoshi
c3fac61f56
Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged ( #18424 )
...
* Fix `Mastodon::RaceConditionError` that occurs when external status is reblogged
* Replace to `@object`
2022-05-16 01:00:09 +02:00
Claire
dc350be6f5
Use upstream's settings for CW auto-expand and column swiping ( #1770 )
...
* Use Mastodon server-side settings for automatically expanding toots with CWs
* Add modal warning about settings changes
* Use Mastodon server-side settings for disabling swiping
2022-05-15 17:30:40 +02:00
Eugen Rochko
95a036c598
New Crowdin updates ( #18339 )
...
* New translations en.yml (Asturian)
* New translations en.yml (Kannada)
* New translations en.yml (Sinhala)
* New translations en.yml (Marathi)
* New translations en.yml (Malay)
* New translations en.yml (Croatian)
* New translations en.yml (Norwegian Nynorsk)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.yml (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Telugu)
* New translations en.yml (Breton)
* New translations en.yml (Welsh)
* New translations en.yml (Esperanto)
* New translations en.yml (Uyghur)
* New translations en.yml (Chinese Traditional, Hong Kong)
* New translations en.yml (Tatar)
* New translations en.yml (Malayalam)
* New translations en.yml (English, United Kingdom)
* New translations en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Turkish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Swedish)
* New translations en.yml (Catalan)
* New translations en.yml (Czech)
* New translations en.yml (Spanish)
* New translations en.yml (Greek)
* New translations en.yml (Portuguese)
* New translations en.yml (Ukrainian)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (German)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Polish)
* New translations en.yml (Asturian)
* New translations en.yml (Scottish Gaelic)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations en.json (Persian)
* New translations en.yml (Persian)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.json (Persian)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations devise.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Chinese Traditional)
* New translations doorkeeper.en.yml (Chinese Traditional)
* New translations simple_form.en.yml (Chinese Traditional)
* New translations en.yml (Icelandic)
* New translations en.yml (Indonesian)
* New translations en.yml (Japanese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Japanese)
* New translations en.yml (Latvian)
* New translations en.yml (Galician)
* New translations en.yml (Thai)
* New translations en.yml (Italian)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.json (Korean)
* New translations en.yml (Hungarian)
* New translations en.yml (Welsh)
* New translations en.yml (French)
* New translations en.yml (Scottish Gaelic)
* New translations en.json (Scottish Gaelic)
* New translations en.yml (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.yml (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Ido)
* New translations en.json (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Afrikaans)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Ido)
* New translations en.json (Catalan)
* New translations en.json (Catalan)
* 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 (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Ido)
* New translations doorkeeper.en.yml (Ido)
* New translations devise.en.yml (Ido)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Catalan)
* New translations en.yml (Afrikaans)
* New translations en.yml (Latvian)
* New translations en.yml (Italian)
* New translations en.yml (Greek)
* New translations en.yml (Hungarian)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Ido)
* New translations en.yml (Hungarian)
* New translations en.json (Hungarian)
* New translations simple_form.en.yml (Hungarian)
* New translations en.yml (Korean)
* New translations en.yml (Russian)
* New translations en.yml (Hungarian)
* New translations en.yml (Turkish)
* New translations en.yml (Korean)
* New translations en.yml (Portuguese)
* New translations en.yml (Vietnamese)
* New translations en.yml (Portuguese)
* New translations en.yml (Icelandic)
* New translations en.yml (Albanian)
* New translations en.yml (Czech)
* New translations en.yml (Czech)
* New translations en.yml (Danish)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Polish)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Ukrainian)
* New translations en.yml (Indonesian)
* New translations en.yml (Spanish)
* New translations en.yml (Kurmanji (Kurdish))
* 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 simple_form.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 (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations doorkeeper.en.yml (Chinese Simplified)
* New translations en.yml (German)
* New translations en.json (Chinese Simplified)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Galician)
* New translations en.yml (French)
* New translations en.json (Galician)
* New translations en.yml (French)
* New translations en.yml (Welsh)
* New translations en.yml (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Arabic)
* New translations doorkeeper.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Sorani (Kurdish))
* New translations simple_form.en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations en.yml (Arabic)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Hindi)
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Slovenian)
* New translations en.yml (Hungarian)
* New translations en.json (English, United Kingdom)
* New translations en.yml (French)
* New translations en.yml (French)
* New translations en.json (French)
* New translations en.json (Croatian)
* New translations en.json (Chinese Simplified)
* New translations en.json (Chinese Simplified)
* New translations en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Welsh)
* New translations en.yml (Welsh)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Traditional)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Chinese Simplified)
* New translations en.yml (Chinese Traditional)
* New translations en.json (Tatar)
* New translations en.json (Tatar)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations en.yml (Catalan)
* New translations en.yml (Hebrew)
* New translations devise.en.yml (Catalan)
* New translations en.yml (Russian)
* New translations doorkeeper.en.yml (Russian)
* New translations en.yml (Russian)
* New translations en.yml (Swedish)
* New translations en.yml (Spanish)
* New translations en.yml (Turkish)
* New translations en.yml (Welsh)
* New translations en.yml (Latvian)
* New translations en.json (Slovak)
* New translations en.yml (Slovak)
* New translations en.json (Slovak)
* New translations en.yml (Czech)
* New translations en.yml (Portuguese)
* New translations en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.yml (Afrikaans)
* New translations activerecord.en.yml (Afrikaans)
* New translations en.json (Esperanto)
* New translations en.json (Esperanto)
* New translations en.yml (Spanish, Argentina)
* New translations en.yml (Ido)
* New translations en.json (Spanish, Argentina)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Danish)
* New translations en.yml (Vietnamese)
* New translations en.yml (German)
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.yml (Polish)
* New translations en.yml (Indonesian)
* New translations en.yml (Korean)
* New translations en.yml (Italian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Ido)
* New translations en.yml (Polish)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2022-05-15 18:04:59 +09:00
James Smith
98400a6887
Support STREAMING_API_BASE_URL in Helm Chart ( #18408 )
...
This adds a mastodon.streaming.base_url setting in the Helm chart values
file to allow setting the STREAMING_API_BASE_URL in the Mastodon environnment
config map.
2022-05-14 10:03:44 +02:00
Eugen Rochko
42c976fd65
Fix missing string for appeal validation error ( #18410 )
2022-05-14 06:51:59 +02:00
Claire
aa08399e6f
Fix setting for trending tags and trending links notifications being swapped ( #1771 )
2022-05-13 22:57:47 +02:00
Eugen Rochko
6cf57c6765
Refactor how Redis locks are created ( #18400 )
...
* Refactor how Redis locks are created
* Fix autorelease duration on account deletion lock
2022-05-13 00:02:35 +02:00
Jeong Arm
12535568f7
Fix rss view on hashtag ( #18406 )
2022-05-12 22:40:54 +02:00
dependabot[bot]
bda8345e91
Bump rails from 6.1.5.1 to 6.1.6 ( #18372 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.5.1 to 6.1.6.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.5.1...v6.1.6 )
---
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-12 10:54:27 +09:00
dependabot[bot]
2923ca461f
Bump @rails/ujs from 6.1.5 to 6.1.6 ( #18380 )
...
Bumps [@rails/ujs](https://github.com/rails/rails ) from 6.1.5 to 6.1.6.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.5...v6.1.6 )
---
updated-dependencies:
- dependency-name: "@rails/ujs"
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-12 10:44:41 +09:00
dependabot[bot]
a52dc01f30
Bump nokogiri from 1.13.4 to 1.13.6 ( #18371 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.13.4 to 1.13.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.6/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.4...v1.13.6 )
---
updated-dependencies:
- dependency-name: nokogiri
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-12 10:43:30 +09:00
dependabot[bot]
3261d89af6
Bump aws-sdk-s3 from 1.113.2 to 1.114.0 ( #18373 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.113.2 to 1.114.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases )
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md )
- [Commits](https://github.com/aws/aws-sdk-ruby/commits )
---
updated-dependencies:
- dependency-name: aws-sdk-s3
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-12 10:42:52 +09:00
Claire
32762f2fa8
Merge pull request #1767 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-05-11 12:14:29 +02:00
Eugen Rochko
6fb837aa1d
[Glitch] Add `limited` attribute to accounts in REST API and a warning in web UI
...
Port b4d373a3df
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:59:08 +02:00
Eugen Rochko
bb1a3e902d
[Glitch] Remove Keybase integration
...
Port 7de0ee7aba
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 11:09:20 +02:00
Claire
b356a995c1
[Glitch] Fix block/mute lists showing a follow button when unblocking a user ( #18364 )
...
Port 662ed53c18
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-05-11 09:44:27 +02:00
Claire
5fd8780b14
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-11 09:37:48 +02:00
dependabot[bot]
95555f15b5
Bump jest from 28.0.3 to 28.1.0 ( #18377 )
...
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest ) from 28.0.3 to 28.1.0.
- [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.1.0/packages/jest )
---
updated-dependencies:
- dependency-name: jest
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-11 04:15:04 +09:00
dependabot[bot]
68260c0257
Bump sidekiq-unique-jobs from 7.1.21 to 7.1.22 ( #18375 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.1.21 to 7.1.22.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.21...v7.1.22 )
---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
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-11 04:09:31 +09:00
dependabot[bot]
a2ef5e3212
Bump array-includes from 3.1.4 to 3.1.5 ( #18381 )
...
Bumps [array-includes](https://github.com/es-shims/array-includes ) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/es-shims/array-includes/releases )
- [Changelog](https://github.com/es-shims/array-includes/blob/main/CHANGELOG.md )
- [Commits](https://github.com/es-shims/array-includes/compare/v3.1.4...v3.1.5 )
---
updated-dependencies:
- dependency-name: array-includes
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-11 04:08:27 +09:00
dependabot[bot]
3ca348fa11
Bump i18n-tasks from 1.0.9 to 1.0.10 ( #18370 )
...
Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks ) from 1.0.9 to 1.0.10.
- [Release notes](https://github.com/glebm/i18n-tasks/releases )
- [Changelog](https://github.com/glebm/i18n-tasks/blob/main/CHANGES.md )
- [Commits](https://github.com/glebm/i18n-tasks/compare/v1.0.9...v1.0.10 )
---
updated-dependencies:
- dependency-name: i18n-tasks
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-11 04:04:12 +09:00
dependabot[bot]
593637145e
Bump babel-jest from 28.0.3 to 28.1.0 ( #18374 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 28.0.3 to 28.1.0.
- [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.1.0/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
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-11 04:02:08 +09:00
dependabot[bot]
19216f93b5
Bump jest-environment-jsdom from 28.0.2 to 28.1.0 ( #18379 )
...
Bumps [jest-environment-jsdom](https://github.com/facebook/jest/tree/HEAD/packages/jest-environment-jsdom ) from 28.0.2 to 28.1.0.
- [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.1.0/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>
2022-05-11 04:01:51 +09:00
dependabot[bot]
e7d0bf731e
Bump capybara from 3.36.0 to 3.37.1 ( #18376 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.36.0 to 3.37.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases )
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md )
- [Commits](https://github.com/teamcapybara/capybara/compare/3.36.0...3.37.1 )
---
updated-dependencies:
- dependency-name: capybara
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-11 04:01:16 +09:00
dependabot[bot]
d3c18058d7
Bump react-select from 5.3.1 to 5.3.2 ( #18382 )
...
Bumps [react-select](https://github.com/JedWatson/react-select ) from 5.3.1 to 5.3.2.
- [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.1...react-select@5.3.2 )
---
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-11 04:00:31 +09:00
Eugen Rochko
b4d373a3df
Add `limited` attribute to accounts in REST API and a warning in web UI ( #18344 )
2022-05-10 09:44:35 +02:00
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