526332c545
Fix account deletion sometimes failing because of optimistic locks ( #16317 )
...
* Fix account deletion sometimes failing because of optimistic locks
In some rare occasions[1], deleting accounts would fail with a
`StaleObjectError` exception.
Indeed, account deletion manually sets the `AccountStat` values without
handling cases where the optimistic locking on `AccountStat` would fail.
To my knowledge, with the rewrite of account counters in #15913 , the
`DeleteAccountService` is now the only place that changes the counters in
a way that is not atomic.
Since in this specific case, we do not care about the previous values of the
account counters, it appears we don't need locking at all for this table
anymore.
[1]: https://discourse.joinmastodon.org/t/account-cant-be-deleted/3602
* Bump MAX_SUPPORTED_VERSION in maintenance script
2021-06-02 17:41:25 +02:00
be8079f637
Fix deprecated slash as division in SASS files ( #16347 )
...
Fixes #16293
2021-06-01 23:47:27 +02:00
abf4c2ab21
Fix `tootctl search deploy` on Ruby 3 ( #16346 )
...
Fixes #16344
2021-06-01 17:31:49 +02:00
abd7b4636a
Add assets from Twemoji 13.1.0 ( #16345 )
...
* Add assets from Twemoji 13.1.0
* Update emoji-mart
2021-06-01 14:35:49 +02:00
aafac8dc71
Bump babel-jest from 26.6.3 to 27.0.2 ( #16338 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 26.6.3 to 27.0.2.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.0.2/packages/babel-jest )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 15:19:55 +09:00
ea837e4a46
Bump css-loader from 5.2.5 to 5.2.6 ( #16335 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 5.2.5 to 5.2.6.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.2.5...v5.2.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:14:49 +09:00
0c64bb45e5
Bump nokogiri from 1.11.5 to 1.11.6 ( #16332 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.5 to 1.11.6.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.5...v1.11.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:11:23 +09:00
19ac24ad85
Bump aws-sdk-s3 from 1.95.0 to 1.95.1 ( #16333 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.95.0 to 1.95.1.
- [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 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:11:10 +09:00
121d15f11c
Bump @babel/preset-env from 7.14.2 to 7.14.4 ( #16337 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.14.2 to 7.14.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.14.4/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:10:49 +09:00
75bf15212b
Bump eslint-plugin-react from 7.23.2 to 7.24.0 ( #16339 )
...
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react ) from 7.23.2 to 7.24.0.
- [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.23.2...v7.24.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:08:57 +09:00
4c41171c54
Bump eslint-plugin-import from 2.23.3 to 2.23.4 ( #16334 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.23.3 to 2.23.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.23.3...v2.23.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:08:37 +09:00
1654bea0ab
Bump react-swipeable-views from 0.13.9 to 0.14.0 ( #16336 )
...
Bumps [react-swipeable-views](https://github.com/oliviertassinari/react-swipeable-views ) from 0.13.9 to 0.14.0.
- [Release notes](https://github.com/oliviertassinari/react-swipeable-views/releases )
- [Changelog](https://github.com/oliviertassinari/react-swipeable-views/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oliviertassinari/react-swipeable-views/compare/v0.13.9...v0.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-01 13:08:18 +09:00
8be1ec13ae
Fix spelling error in i18n workflow ( #16326 )
2021-06-01 05:18:32 +02:00
3b27b09acb
Fix some IDs in instance actor outbox ( #16343 )
2021-05-31 22:59:30 +02:00
02dffa8edd
Merge pull request #1546 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-31 16:49:48 +02:00
fb8c5979b4
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-31 11:53:57 +02:00
5ef216d032
Remove set-cookie header on custom.css ( #16314 )
...
* Remove set-cookie header on custom.css
* Additional fix for set-cookie
2021-05-30 17:57:47 +02:00
f173275e33
Bump ws from 7.4.5 to 7.4.6 ( #16329 )
...
Bumps [ws](https://github.com/websockets/ws ) from 7.4.5 to 7.4.6.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/7.4.5...7.4.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 10:23:01 +09:00
f18e3caa1a
Bump eslint from 7.26.0 to 7.27.0 ( #16304 )
...
Bumps [eslint](https://github.com/eslint/eslint ) from 7.26.0 to 7.27.0.
- [Release notes](https://github.com/eslint/eslint/releases )
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md )
- [Commits](https://github.com/eslint/eslint/compare/v7.26.0...v7.27.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 09:19:29 +09:00
cf08a595af
Bump rubocop from 1.14.0 to 1.15.0 ( #16300 )
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.14.0 to 1.15.0.
- [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.14.0...v1.15.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 09:17:34 +09:00
30cdedfa6e
Bump httplog from 1.4.3 to 1.5.0 ( #16303 )
...
Bumps [httplog](https://github.com/trusche/httplog ) from 1.4.3 to 1.5.0.
- [Release notes](https://github.com/trusche/httplog/releases )
- [Changelog](https://github.com/trusche/httplog/blob/v1.5.0/CHANGELOG.md )
- [Commits](https://github.com/trusche/httplog/compare/v1.4.3...v1.5.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-29 09:17:23 +09:00
bbc9ca5d38
Merge pull request #1544 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-27 18:59:48 +02:00
10a31a934f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream's README got updated, but we have a completely different one.
Kept ours.
2021-05-27 17:58:44 +02:00
2efe711a51
Bump aws-sdk-s3 from 1.94.1 to 1.95.0 ( #16298 )
...
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby ) from 1.94.1 to 1.95.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 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:55:25 +09:00
8fb9dfa9cd
Bump eslint-plugin-import from 2.23.2 to 2.23.3 ( #16299 )
...
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import ) from 2.23.2 to 2.23.3.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases )
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.23.2...v2.23.3 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:55:13 +09:00
a2aa51b7e4
Bump nokogiri from 1.11.4 to 1.11.5 ( #16301 )
...
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri ) from 1.11.4 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases )
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md )
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.4...v1.11.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:54:58 +09:00
fa1ce2a6cd
Bump puma from 5.3.1 to 5.3.2 ( #16302 )
...
Bumps [puma](https://github.com/puma/puma ) from 5.3.1 to 5.3.2.
- [Release notes](https://github.com/puma/puma/releases )
- [Changelog](https://github.com/puma/puma/blob/master/History.md )
- [Commits](https://github.com/puma/puma/compare/v5.3.1...v5.3.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:54:45 +09:00
2e759b9c10
Bump sass from 1.33.0 to 1.34.0 ( #16307 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.33.0 to 1.34.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.33.0...1.34.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:54:32 +09:00
1af1d4d015
Bump sidekiq-unique-jobs from 7.0.10 to 7.0.11 ( #16296 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 7.0.10 to 7.0.11.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.0.10...v7.0.11 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:48:43 +09:00
01dfa58aab
Bump webpacker from 5.3.0 to 5.4.0 ( #16297 )
...
Bumps [webpacker](https://github.com/rails/webpacker ) from 5.3.0 to 5.4.0.
- [Release notes](https://github.com/rails/webpacker/releases )
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rails/webpacker/compare/v5.3.0...v5.4.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:48:18 +09:00
800a6c4424
Bump @babel/core from 7.14.2 to 7.14.3 ( #16305 )
...
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core ) from 7.14.2 to 7.14.3.
- [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.14.3/packages/babel-core )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:36:47 +09:00
0783ec18c1
Bump webpack-bundle-analyzer from 4.4.1 to 4.4.2 ( #16308 )
...
Bumps [webpack-bundle-analyzer](https://github.com/webpack-contrib/webpack-bundle-analyzer ) from 4.4.1 to 4.4.2.
- [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.4.1...v4.4.2 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:35:48 +09:00
9e6a9e0774
Bump css-loader from 5.2.4 to 5.2.5 ( #16309 )
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 5.2.4 to 5.2.5.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases )
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md )
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v5.2.4...v5.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:35:20 +09:00
a581da059e
Bump dns-packet from 1.3.1 to 1.3.4 ( #16319 )
...
Bumps [dns-packet](https://github.com/mafintosh/dns-packet ) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases )
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-27 17:32:05 +09:00
f4caad0b6b
Bump browserslist from 4.14.5 to 4.16.6 ( #16311 )
...
Bumps [browserslist](https://github.com/browserslist/browserslist ) from 4.14.5 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases )
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md )
- [Commits](https://github.com/browserslist/browserslist/compare/4.14.5...4.16.6 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-25 03:42:46 +02:00
16b524feb6
Change IRC channel to LiberaChat in README ( #16279 )
...
Freenode was taken over by a different entity, and former Freenode
staff created LiberaChat.
Short summary of the situation: https://blog.bofh.it/debian/id_461
With more details:
* https://gist.github.com/joepie91/df80d8d36cd9d1bde46ba018af497409
* https://gist.github.com/aaronmdjones/1a9a93ded5b7d162c3f58bdd66b8f491
2021-05-24 05:16:45 +02:00
fd5ab80eed
Fix some typos and improve some UI text ( #16283 )
...
* Fix typo: similiar → similar
Suggestion of unextro: https://crowdin.com/profile/unextro
* Fix typo: ChromeOS → Chrome OS
Suggestion of unextro: https://crowdin.com/profile/unextro
* Fix typo: Successfully remove → Successfully removed
Suggestion of GunChleoc: https://crowdin.com/profile/gunchleoc
* Fix typo: will now be processed in due time → will be processed
Suggestion of NCAA: https://crowdin.com/profile/ncaa
* Improve UI text: use “waiting period” instead of “cooldown period”
Suggestion of NCAA: https://crowdin.com/profile/ncaa
* Improve UI text: use “for today” instead of “for that day”
Suggestion of NCAA: https://crowdin.com/profile/ncaa
2021-05-24 03:03:01 +02:00
b715cede4d
Fix mailer jobs for deleted notifications erroring out ( #16294 )
...
Fixes an oversight in the Rails 6 migration
2021-05-24 03:02:46 +02:00
fcdae10072
Ignore git related files from docker build ( #16282 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-05-22 17:43:07 +02:00
2024aef0f9
Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2021-05-22 15:16:21 +02:00
12f8f39e25
Fix media proxy RedisLocks auto-releasing too fast ( #16291 )
...
Follow-up to #16276
2021-05-22 15:00:33 +02:00
1db28332b5
Add Actions for check i18n ( #16285 )
2021-05-22 15:00:20 +02:00
8027d921ab
[Glitch] Remove duplicate CSS properties
...
Port 028ba13eb3
2021-05-22 13:22:26 +02:00
1a591ffc8b
[Glitch] Fix unread notification count when polling
...
Port 92f1d739b5
2021-05-22 13:20:07 +02:00
bb0c9fcde7
[Glitch] Remove duplicate CSS property of margin
...
Port 689974b1ed
2021-05-22 13:18:32 +02:00
5f334807d2
Merge branch 'main' into glitch-soc/merge-upstream
2021-05-22 13:11:31 +02:00
92a9fcf0e1
Bump @babel/plugin-transform-runtime from 7.13.15 to 7.14.3 ( #16286 )
...
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime ) from 7.13.15 to 7.14.3.
- [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.14.3/packages/babel-plugin-transform-runtime )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 09:58:01 +09:00
d237dd9204
Bump sass from 1.32.12 to 1.33.0 ( #16287 )
...
Bumps [sass](https://github.com/sass/dart-sass ) from 1.32.12 to 1.33.0.
- [Release notes](https://github.com/sass/dart-sass/releases )
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md )
- [Commits](https://github.com/sass/dart-sass/compare/1.32.12...1.33.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 09:38:57 +09:00
649118714e
Bump @babel/plugin-proposal-decorators from 7.13.15 to 7.14.2 ( #16261 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.13.15 to 7.14.2.
- [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.14.2/packages/babel-plugin-proposal-decorators )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 09:29:38 +09:00
d8ac96bd39
Bump @babel/preset-env from 7.14.1 to 7.14.2 ( #16267 )
...
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env ) from 7.14.1 to 7.14.2.
- [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.14.2/packages/babel-preset-env )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-22 09:29:06 +09:00
Claire