about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2021-06-02Fix account deletion sometimes failing because of optimistic locks (#16317)Claire
* 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-01Fix deprecated slash as division in SASS files (#16347)Claire
Fixes #16293
2021-06-01Fix `tootctl search deploy` on Ruby 3 (#16346)Claire
Fixes #16344
2021-06-01Add assets from Twemoji 13.1.0 (#16345)Eugen Rochko
* Add assets from Twemoji 13.1.0 * Update emoji-mart
2021-06-01Bump babel-jest from 26.6.3 to 27.0.2 (#16338)dependabot[bot]
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-01Bump css-loader from 5.2.5 to 5.2.6 (#16335)dependabot[bot]
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-01Bump nokogiri from 1.11.5 to 1.11.6 (#16332)dependabot[bot]
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-01Bump aws-sdk-s3 from 1.95.0 to 1.95.1 (#16333)dependabot[bot]
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-01Bump @babel/preset-env from 7.14.2 to 7.14.4 (#16337)dependabot[bot]
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-01Bump eslint-plugin-react from 7.23.2 to 7.24.0 (#16339)dependabot[bot]
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-01Bump eslint-plugin-import from 2.23.3 to 2.23.4 (#16334)dependabot[bot]
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-01Bump react-swipeable-views from 0.13.9 to 0.14.0 (#16336)dependabot[bot]
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-01Fix spelling error in i18n workflow (#16326)koyu
2021-05-31Fix some IDs in instance actor outbox (#16343)Claire
2021-05-31Merge pull request #1546 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-05-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-05-30Remove set-cookie header on custom.css (#16314)Jeong Arm
* Remove set-cookie header on custom.css * Additional fix for set-cookie
2021-05-29Bump ws from 7.4.5 to 7.4.6 (#16329)dependabot[bot]
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-29Bump eslint from 7.26.0 to 7.27.0 (#16304)dependabot[bot]
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-29Bump rubocop from 1.14.0 to 1.15.0 (#16300)dependabot[bot]
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-29Bump httplog from 1.4.3 to 1.5.0 (#16303)dependabot[bot]
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-27Merge pull request #1544 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-05-27Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream's README got updated, but we have a completely different one. Kept ours.
2021-05-27Bump aws-sdk-s3 from 1.94.1 to 1.95.0 (#16298)dependabot[bot]
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-27Bump eslint-plugin-import from 2.23.2 to 2.23.3 (#16299)dependabot[bot]
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-27Bump nokogiri from 1.11.4 to 1.11.5 (#16301)dependabot[bot]
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-27Bump puma from 5.3.1 to 5.3.2 (#16302)dependabot[bot]
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-27Bump sass from 1.33.0 to 1.34.0 (#16307)dependabot[bot]
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-27Bump sidekiq-unique-jobs from 7.0.10 to 7.0.11 (#16296)dependabot[bot]
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-27Bump webpacker from 5.3.0 to 5.4.0 (#16297)dependabot[bot]
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-27Bump @babel/core from 7.14.2 to 7.14.3 (#16305)dependabot[bot]
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-27Bump webpack-bundle-analyzer from 4.4.1 to 4.4.2 (#16308)dependabot[bot]
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-27Bump css-loader from 5.2.4 to 5.2.5 (#16309)dependabot[bot]
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-27Bump dns-packet from 1.3.1 to 1.3.4 (#16319)dependabot[bot]
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-25Bump browserslist from 4.14.5 to 4.16.6 (#16311)dependabot[bot]
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-24Change IRC channel to LiberaChat in README (#16279)Valentin Lorentz
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-24Fix some typos and improve some UI text (#16283)Mélanie Chauvel
* 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-24Fix mailer jobs for deleted notifications erroring out (#16294)Claire
Fixes an oversight in the Rails 6 migration
2021-05-22Ignore git related files from docker build (#16282)Jeong Arm
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2021-05-22Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstreamClaire
Merge upstream changes
2021-05-22Fix media proxy RedisLocks auto-releasing too fast (#16291)Claire
Follow-up to #16276
2021-05-22Add Actions for check i18n (#16285)Yamagishi Kazutoshi
2021-05-22[Glitch] Remove duplicate CSS propertiesZero King
Port 028ba13eb3f1e5e5e35485fe1531ec7630e84abe to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-22[Glitch] Fix unread notification count when pollingClaire
Port 92f1d739b554b6d5496013fb50196a14434943e2 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-22[Glitch] Remove duplicate CSS property of marginZero King
Port 689974b1ed081c238560d6b368609acc50dc7336 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2021-05-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
2021-05-22Bump @babel/plugin-transform-runtime from 7.13.15 to 7.14.3 (#16286)dependabot[bot]
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-22Bump sass from 1.32.12 to 1.33.0 (#16287)dependabot[bot]
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-22Bump @babel/plugin-proposal-decorators from 7.13.15 to 7.14.2 (#16261)dependabot[bot]
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-22Bump @babel/preset-env from 7.14.1 to 7.14.2 (#16267)dependabot[bot]
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>