88b19ac3f5
Bump @testing-library/jest-dom from 5.15.1 to 5.16.0 ( #17095 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.15.1 to 5.16.0.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.1...v5.16.0 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
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>
2021-12-04 23:53:26 +09:00
1710915711
Bump reselect from 4.1.4 to 4.1.5 ( #17075 )
...
Bumps [reselect](https://github.com/reduxjs/reselect ) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/reduxjs/reselect/releases )
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.4...v4.1.5 )
---
updated-dependencies:
- dependency-name: reselect
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>
2021-12-04 23:41:40 +09:00
f6a8b0dd6e
Bump redux-thunk from 2.4.0 to 2.4.1 ( #17074 )
...
Bumps [redux-thunk](https://github.com/reduxjs/redux-thunk ) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/reduxjs/redux-thunk/releases )
- [Commits](https://github.com/reduxjs/redux-thunk/compare/v2.4.0...v2.4.1 )
---
updated-dependencies:
- dependency-name: redux-thunk
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>
2021-12-04 23:41:12 +09:00
4b30129391
Bump ws from 8.2.3 to 8.3.0 ( #17076 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.2.3 to 8.3.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.2.3...8.3.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>
2021-12-04 23:40:19 +09:00
f80d50fc42
Bump @testing-library/jest-dom from 5.15.0 to 5.15.1 ( #17081 )
...
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom ) from 5.15.0 to 5.15.1.
- [Release notes](https://github.com/testing-library/jest-dom/releases )
- [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md )
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.15.0...v5.15.1 )
---
updated-dependencies:
- dependency-name: "@testing-library/jest-dom"
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>
2021-12-04 23:39:18 +09:00
0268868e25
Bump sass from 1.43.4 to 1.43.5 ( #17080 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.43.4 to 1.43.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.43.4...1.43.5 )
---
updated-dependencies:
- dependency-name: sass
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>
2021-12-04 23:39:00 +09:00
f21537ba6b
Bump babel-jest from 27.3.1 to 27.4.0 ( #17078 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.3.1 to 27.4.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/v27.4.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>
2021-12-04 23:38:38 +09:00
d911c17f52
Fix unneeded outline around list name edition input
2021-12-03 21:03:40 +01:00
2e0d5753e3
Prevent translations from accidentally becoming completely different from source strings on Crowdin without translators noticing. ( #17085 )
2021-12-01 19:03:35 +01:00
c5751f8377
Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-30 17:34:22 +01:00
5bf3a09c5b
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-30 12:13:54 +01:00
a458b74c7e
Fix error on trending mailer due to missing constant ( #17072 )
2021-11-29 17:39:40 +01:00
f200775fde
Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 ( #17023 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.16.0 to 7.16.4.
- [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.16.4/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>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-11-29 15:41:17 +09:00
87ed4e7e45
Bump cld3 from 3.4.2 to 3.4.3 ( #17047 )
...
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby ) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases )
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.2...v3.4.3 )
---
updated-dependencies:
- dependency-name: cld3
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>
2021-11-29 15:19:22 +09:00
9380318681
Bump aws-sdk-s3 from 1.106.0 to 1.107.0 ( #17048 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.106.0 to 1.107.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>
2021-11-29 15:18:59 +09:00
7be9c31862
Bump @babel/preset-env from 7.16.0 to 7.16.4 ( #17024 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.16.0 to 7.16.4.
- [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.16.4/packages/babel-preset-env )
---
updated-dependencies:
- dependency-name: "@babel/preset-env"
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>
2021-11-29 15:18:41 +09:00
4a109ec1ba
Fix server graph on admin/tags/:id ( #17066 )
2021-11-28 23:13:07 +01:00
af93d938d4
Update tootsuite/mastodon Docker tag to v3.4.4 ( #17065 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-11-27 03:06:39 +01:00
4aec8087c7
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-26 23:41:01 +01:00
ca5d78816b
[Glitch] Fix searching for additional hashtags in hashtag column
...
Port 3f382e337d
2021-11-26 22:58:46 +01:00
d5d44b431a
[Glitch] Fix color of hashtag column settings inputs
...
Port 1630807ee2
2021-11-26 22:58:13 +01:00
9b861d56a9
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
Minor conflict due to glitch-soc's extra “enable_keybase” setting.
Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
Minor conflict due to glitch-soc's extra “enable_keybase” setting.
Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
Minor conflict due to an optimization that wasn't shared between
the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
1c826471e7
Fix admin statuses order( #16937 ) ( #16969 )
...
* Fix #16937
* Add test for statuses order
2021-11-26 22:12:27 +01:00
3f382e337d
Fix searching for additional hashtags in hashtag column ( #17054 )
2021-11-26 22:11:09 +01:00
1630807ee2
Fix color of hashtag column settings inputs ( #17058 )
...
Fixes #17057
2021-11-26 22:09:11 +01:00
0ac7efdc50
Fix performance of tootctl statuses remove ( #17052 )
...
* Fix performance of tootctl statuses remove
* Fix model class
2021-11-26 22:08:47 +01:00
ddcb9da74f
Fix opening wrong profile when clicking on username of boosting user in WebUI ( #17060 )
...
Fixes #16799
2021-11-26 22:04:09 +01:00
912c6b3f49
Upgrade bootsnap for Ruby 3.0.3 ( #17064 )
...
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
2021-11-26 22:03:35 +01:00
97151840b0
[Glitch] Port upstream changes about trending links
2021-11-26 11:36:22 +01:00
06631fdc53
Fix ElasticSearch to Elasticsearch ( #17050 )
2021-11-26 08:30:02 +01:00
53aca8aecf
Add batch_size option to bin/tootctl search deploy ( #17049 )
2021-11-26 08:29:53 +01:00
0909874c08
Bump sprockets-rails from 3.4.0 to 3.4.1 ( #17021 )
...
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails ) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases )
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1 )
---
updated-dependencies:
- dependency-name: sprockets-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>
2021-11-26 14:06:23 +09:00
45f8eb110a
Bump eslint-plugin-react from 7.27.0 to 7.27.1 ( #17022 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.27.0 to 7.27.1.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases )
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md )
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.27.0...v7.27.1 )
---
updated-dependencies:
- dependency-name: eslint-plugin-react
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>
2021-11-26 14:06:12 +09:00
5b8928fef9
Bump reselect from 4.1.2 to 4.1.4 ( #17025 )
...
Bumps [reselect](https://github.com/reduxjs/reselect ) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases )
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md )
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4 )
---
updated-dependencies:
- dependency-name: reselect
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>
2021-11-26 14:01:53 +09:00
9a77a16087
Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 ( #17027 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.16.0 to 7.16.4.
- [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.16.4/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
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>
2021-11-26 14:01:31 +09:00
7de0ee7aba
Remove Keybase integration ( #17045 )
2021-11-26 05:58:18 +01:00
fd868f8ca0
Bump version to 3.4.4
2021-11-26 01:32:31 +01:00
4cd33a2c71
Fix "bundle exec rails mastodon:setup" crashing in some circumstances ( #16976 )
...
Fix regression from #16896
2021-11-26 01:31:28 +01:00
025a2ceb0f
Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-11-26 01:25:29 +01:00
f264cca1d2
Fix filtering DMs from non-followed users ( #17042 )
2021-11-26 01:22:33 +01:00
5e4b04de88
Fix handling of recursive toots in WebUI ( #17041 )
2021-11-26 01:22:27 +01:00
3c18311d86
Fix error when suspending user with an already-existing canonical email block ( #17036 )
...
* Fix error when suspending user with an already-existing canonical email block
Fixes #17033
While attempting to create a `CanonicalEmailBlock` with an existing hash would
raise an `ActiveRecord::RecordNotUnique` error, this being done within a
transaction would cancel the whole transaction. For this reason, checking for
uniqueness in Rails would query the database within the transaction and avoid
invalidating the whole transaction for this reason.
A race condition is still possible, where multiple accounts sharing a canonical
email would be blocked in concurrent transactions, in which only one would
succeed, but that is way less likely to happen that the current issue, and can
always be retried after the first failure, unlike the current situation.
* Add tests
2021-11-26 01:22:10 +01:00
e5113a8cad
Fix overflow of long profile fields in admin view ( #17010 )
2021-11-26 01:21:57 +01:00
22cd1e6ab5
Fix confusing error when webfinger request returns empty document ( #16986 )
...
For some reason, some misconfigured servers return an empty document when
queried over webfinger. Since an empty document does not lead to a parse
error, the error is not caught properly and triggers uncaught exceptions
later on.
This PR fixes that by immediately erroring out with `Webfinger::Error` on
getting an empty response.
2021-11-26 01:21:50 +01:00
e65ede1ac5
Fix upload of remote media with OpenStack Swift sometimes failing ( #16998 )
...
Under certain conditions, files fetched from remotes trigger an error when
being uploaded using OpenStack Swift. This is because in some cases, the
remote server will not return a content-length, so our ResponseWithLimitAdapter
will hold a `nil` value for `#size`, which will lead to an invalid value
for the Content-Length header of the Swift API call.
This commit fixes that by taking the size from the actually-downloaded file
size rather than the upstream-provided Content-Length header value.
2021-11-26 01:21:43 +01:00
1bcb3daf7e
Fix logout link not working in safari ( #16574 )
2021-11-26 01:21:37 +01:00
9c610ca0a4
Fix “open” link of media modal not closing modal ( #16524 )
2021-11-26 01:21:29 +01:00
77d0297313
Fix replying from modal ( #16516 )
...
Fixes #16515
Not using a router object somehow made `this.history` lag behind the real
browser history whenever pushing a new history item in `replyCompose`.
Not using the context-provided router in this case was an oversight made
when porting glitch-soc changes in #16499 .
2021-11-26 01:21:21 +01:00
3304df0ab5
Merge branch 'main' into glitch-soc/merge-upstream
2021-11-26 01:15:32 +01:00
afd71867ba
Revert "Fix trends admin page crashing"
...
This reverts commit 5f10e64330
2021-11-26 01:15:29 +01:00
dependabot[bot]