]> cat aescling's git repositories - mastodon.git/log
mastodon.git
4 years agoMerge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs
Claire [Mon, 17 Jan 2022 23:18:07 +0000 (00:18 +0100)]
Merge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs

Refactor glitch-soc's theme handling

4 years agoPlease CodeClimate
Claire [Mon, 17 Jan 2022 12:06:06 +0000 (13:06 +0100)]
Please CodeClimate

4 years agoMove controller theming code to concern
Claire [Mon, 17 Jan 2022 11:50:02 +0000 (12:50 +0100)]
Move controller theming code to concern

4 years agoMerge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Mon, 17 Jan 2022 09:01:02 +0000 (10:01 +0100)]
Merge pull request #1661 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoFix `pinned` attribute not being set for private self-posts
Claire [Mon, 17 Jan 2022 08:07:45 +0000 (09:07 +0100)]
Fix `pinned` attribute not being set for private self-posts

4 years ago[Glitch] Add support for private pinned posts
Claire [Sun, 16 Jan 2022 23:49:55 +0000 (00:49 +0100)]
[Glitch] Add support for private pinned posts

Port JS changes from d5c9feb7b7fc489afbd0a287431fe07b42451ef0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Mon, 17 Jan 2022 07:28:17 +0000 (08:28 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream introduced support for private pinned toots, but glitch-soc's query
  was a bit different as it filtered out local-only toots.
  Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
  Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
  Not a real conflict, but the line below was different in glitch-soc due to
  the configurable pinned toots limit.

4 years agoAdd support for private pinned posts (#16954)
Claire [Sun, 16 Jan 2022 23:49:55 +0000 (00:49 +0100)]
Add support for private pinned posts (#16954)

* Add support for private pinned toots

* Allow local user to pin private toots

* Change wording to avoid "direct message"

4 years agoMerge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sun, 16 Jan 2022 21:39:35 +0000 (22:39 +0100)]
Merge pull request #1659 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 16 Jan 2022 21:29:05 +0000 (22:29 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix missing media: 'all' on default skins
Claire [Sun, 16 Jan 2022 21:25:53 +0000 (22:25 +0100)]
Fix missing media: 'all' on default skins

4 years agoRefactor theming HAML template a bit
Claire [Sun, 16 Jan 2022 21:03:43 +0000 (22:03 +0100)]
Refactor theming HAML template a bit

4 years agoRefactor theme config loading
Claire [Sun, 16 Jan 2022 20:46:48 +0000 (21:46 +0100)]
Refactor theme config loading

4 years agoRefactor some more
Claire [Sun, 16 Jan 2022 20:25:11 +0000 (21:25 +0100)]
Refactor some more

4 years agoRefactor glitch-soc's theme handling
Claire [Sun, 16 Jan 2022 19:21:43 +0000 (20:21 +0100)]
Refactor glitch-soc's theme handling

4 years agoFix admin interface crash when displaying deleted user (#17301)
Claire [Sun, 16 Jan 2022 19:57:37 +0000 (20:57 +0100)]
Fix admin interface crash when displaying deleted user (#17301)

4 years ago[Glitch] Gradually increase retry waiting for media processing
Jeong Arm [Mon, 10 Jan 2022 13:25:08 +0000 (22:25 +0900)]
[Glitch] Gradually increase retry waiting for media processing

Port bc7a8ae6d6d2c2118e5c49add83539498b9d543b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sun, 16 Jan 2022 17:11:20 +0000 (18:11 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.

4 years agoAdd line about using vagrant-hostsupdater in the Vagrant short guide (#17243)
Claire [Sun, 16 Jan 2022 15:55:41 +0000 (16:55 +0100)]
Add line about using vagrant-hostsupdater in the Vagrant short guide (#17243)

This is documented in the Vagrantfile, but not in the README. As far as I know,
following the short guide without installing this plugin will not make the
container accessible at mastodon.local, thus breaking the last step of the
guide.

4 years agoRemove IP tracking columns from users table (#16409)
Eugen Rochko [Sun, 16 Jan 2022 12:23:50 +0000 (13:23 +0100)]
Remove IP tracking columns from users table (#16409)

4 years agoFix SMTP_ENABLE_STARTTLS_AUTO/SMTP_TLS/SMTP_SSL environment variables don't work...
tkr [Thu, 13 Jan 2022 11:05:22 +0000 (20:05 +0900)]
Fix SMTP_ENABLE_STARTTLS_AUTO/SMTP_TLS/SMTP_SSL environment variables don't work (#17216)

#17215

4 years agoRemove reference to dev.glitch.social from README
Claire [Mon, 10 Jan 2022 17:01:22 +0000 (18:01 +0100)]
Remove reference to dev.glitch.social from README

Fixes #1584

It's been down for a while.

4 years agoFix media API limit (#17272)
Jeong Arm [Mon, 10 Jan 2022 13:25:24 +0000 (22:25 +0900)]
Fix media API limit (#17272)

4 years agoGradually increase retry waiting for media processing (#17271)
Jeong Arm [Mon, 10 Jan 2022 13:25:08 +0000 (22:25 +0900)]
Gradually increase retry waiting for media processing (#17271)

4 years agohelm: upgrade elasticsearch to 7.x (#17262)
Alexandra Catalina [Sun, 9 Jan 2022 02:21:19 +0000 (18:21 -0800)]
helm: upgrade elasticsearch to 7.x (#17262)

4 years agoMerge pull request #1655 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Fri, 7 Jan 2022 21:43:28 +0000 (22:43 +0100)]
Merge pull request #1655 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix media descriptions not being used for client-side filtering
Claire [Tue, 28 Dec 2021 22:25:50 +0000 (23:25 +0100)]
[Glitch] Fix media descriptions not being used for client-side filtering

Port 37e80994f81bdb07e31f1a55cd37c967822a1a2a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Fri, 7 Jan 2022 18:51:47 +0000 (19:51 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoFix timeline streaming stopping for multiple sessions instead of one (#17259)
Claire [Fri, 7 Jan 2022 18:50:12 +0000 (19:50 +0100)]
Fix timeline streaming stopping for multiple sessions instead of one (#17259)

* Fix timeline streaming stopping for multiple sessions instead of one

Fixes #17256.

In updating the code for a newer version of node-redis, #17183 also broke
redis subscription management when multiple streaming clients subscribe to the
same channel.

This commit restores the redis subscription management code.

* Let node-redis actually handle the subscriptions

4 years agoBump rspec_junit_formatter from 0.4.1 to 0.5.0 (#17249)
dependabot[bot] [Thu, 6 Jan 2022 01:35:42 +0000 (10:35 +0900)]
Bump rspec_junit_formatter from 0.4.1 to 0.5.0 (#17249)

Bumps [rspec_junit_formatter](https://github.com/sj26/rspec_junit_formatter) from 0.4.1 to 0.5.0.
- [Release notes](https://github.com/sj26/rspec_junit_formatter/releases)
- [Changelog](https://github.com/sj26/rspec_junit_formatter/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sj26/rspec_junit_formatter/compare/v0.4.1...v0.5.0)

---
updated-dependencies:
- dependency-name: rspec_junit_formatter
  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>
4 years agoBump @babel/plugin-transform-react-inline-elements from 7.16.5 to 7.16.7 (#17233)
dependabot[bot] [Thu, 6 Jan 2022 01:35:23 +0000 (10:35 +0900)]
Bump @babel/plugin-transform-react-inline-elements from 7.16.5 to 7.16.7 (#17233)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.16.5 to 7.16.7.
- [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.7/packages/babel-plugin-transform-react-inline-elements)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
  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>
4 years agoBump eslint-plugin-react from 7.27.1 to 7.28.0 (#17200)
dependabot[bot] [Thu, 6 Jan 2022 01:28:18 +0000 (10:28 +0900)]
Bump eslint-plugin-react from 7.27.1 to 7.28.0 (#17200)

Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.27.1 to 7.28.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.27.1...v7.28.0)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  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>
4 years agoBump oj from 3.13.10 to 3.13.11 (#17251)
dependabot[bot] [Thu, 6 Jan 2022 01:27:30 +0000 (10:27 +0900)]
Bump oj from 3.13.10 to 3.13.11 (#17251)

Bumps [oj](https://github.com/ohler55/oj) from 3.13.10 to 3.13.11.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.13.10...v3.13.11)

---
updated-dependencies:
- dependency-name: oj
  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>
4 years agoBump rubocop from 1.23.0 to 1.24.1 (#17228)
dependabot[bot] [Thu, 6 Jan 2022 01:26:53 +0000 (10:26 +0900)]
Bump rubocop from 1.23.0 to 1.24.1 (#17228)

Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.23.0 to 1.24.1.
- [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.23.0...v1.24.1)

---
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>
4 years agoBump @babel/core from 7.16.5 to 7.16.7 (#17238)
dependabot[bot] [Thu, 6 Jan 2022 01:25:52 +0000 (10:25 +0900)]
Bump @babel/core from 7.16.5 to 7.16.7 (#17238)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.5 to 7.16.7.
- [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.7/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>
4 years agoBump @babel/preset-react from 7.16.5 to 7.16.7 (#17235)
dependabot[bot] [Thu, 6 Jan 2022 01:25:38 +0000 (10:25 +0900)]
Bump @babel/preset-react from 7.16.5 to 7.16.7 (#17235)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.16.5 to 7.16.7.
- [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.7/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/preset-react"
  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>
4 years agoBump @babel/plugin-transform-runtime from 7.16.5 to 7.16.7 (#17239)
dependabot[bot] [Thu, 6 Jan 2022 01:25:22 +0000 (10:25 +0900)]
Bump @babel/plugin-transform-runtime from 7.16.5 to 7.16.7 (#17239)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.5 to 7.16.7.
- [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.7/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>
4 years agoBump bufferutil from 4.0.5 to 4.0.6 (#17225)
dependabot[bot] [Thu, 6 Jan 2022 01:14:35 +0000 (10:14 +0900)]
Bump bufferutil from 4.0.5 to 4.0.6 (#17225)

Bumps [bufferutil](https://github.com/websockets/bufferutil) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/websockets/bufferutil/releases)
- [Commits](https://github.com/websockets/bufferutil/compare/v4.0.5...v4.0.6)

---
updated-dependencies:
- dependency-name: bufferutil
  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>
4 years agoBump sass from 1.45.1 to 1.45.2 (#17237)
dependabot[bot] [Thu, 6 Jan 2022 01:11:25 +0000 (10:11 +0900)]
Bump sass from 1.45.1 to 1.45.2 (#17237)

Bumps [sass](https://github.com/sass/dart-sass) from 1.45.1 to 1.45.2.
- [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.45.1...1.45.2)

---
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>
4 years agoBump @babel/plugin-proposal-decorators from 7.16.5 to 7.16.7 (#17229)
dependabot[bot] [Thu, 6 Jan 2022 01:10:00 +0000 (10:10 +0900)]
Bump @babel/plugin-proposal-decorators from 7.16.5 to 7.16.7 (#17229)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.5 to 7.16.7.
- [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.7/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>
4 years agoBump i18n-tasks from 0.9.35 to 0.9.37 (#17227)
dependabot[bot] [Thu, 6 Jan 2022 01:01:31 +0000 (10:01 +0900)]
Bump i18n-tasks from 0.9.35 to 0.9.37 (#17227)

Bumps [i18n-tasks](https://github.com/glebm/i18n-tasks) from 0.9.35 to 0.9.37.
- [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/v0.9.35...v0.9.37)

---
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>
4 years agoBump @babel/runtime from 7.16.5 to 7.16.7 (#17236)
dependabot[bot] [Thu, 6 Jan 2022 00:58:12 +0000 (09:58 +0900)]
Bump @babel/runtime from 7.16.5 to 7.16.7 (#17236)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.16.5 to 7.16.7.
- [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.7/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/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>
4 years agoBump eslint-plugin-import from 2.25.3 to 2.25.4 (#17234)
dependabot[bot] [Thu, 6 Jan 2022 00:56:33 +0000 (09:56 +0900)]
Bump eslint-plugin-import from 2.25.3 to 2.25.4 (#17234)

Bumps [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) from 2.25.3 to 2.25.4.
- [Release notes](https://github.com/import-js/eslint-plugin-import/releases)
- [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md)
- [Commits](https://github.com/import-js/eslint-plugin-import/compare/v2.25.3...v2.25.4)

---
updated-dependencies:
- dependency-name: eslint-plugin-import
  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>
4 years agoBump utf-8-validate from 5.0.7 to 5.0.8 (#17231)
dependabot[bot] [Thu, 6 Jan 2022 00:56:20 +0000 (09:56 +0900)]
Bump utf-8-validate from 5.0.7 to 5.0.8 (#17231)

Bumps [utf-8-validate](https://github.com/websockets/utf-8-validate) from 5.0.7 to 5.0.8.
- [Release notes](https://github.com/websockets/utf-8-validate/releases)
- [Commits](https://github.com/websockets/utf-8-validate/compare/v5.0.7...v5.0.8)

---
updated-dependencies:
- dependency-name: utf-8-validate
  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>
4 years agoBump @babel/preset-env from 7.16.5 to 7.16.7 (#17230)
dependabot[bot] [Thu, 6 Jan 2022 00:55:17 +0000 (09:55 +0900)]
Bump @babel/preset-env from 7.16.5 to 7.16.7 (#17230)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.5 to 7.16.7.
- [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.7/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>
4 years agoBump yargs from 17.3.0 to 17.3.1 (#17199)
dependabot[bot] [Thu, 6 Jan 2022 00:54:51 +0000 (09:54 +0900)]
Bump yargs from 17.3.0 to 17.3.1 (#17199)

Bumps [yargs](https://github.com/yargs/yargs) from 17.3.0 to 17.3.1.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.3.0...v17.3.1)

---
updated-dependencies:
- dependency-name: yargs
  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>
4 years agoBump kaminari from 1.2.1 to 1.2.2 (#17197)
dependabot[bot] [Thu, 6 Jan 2022 00:54:38 +0000 (09:54 +0900)]
Bump kaminari from 1.2.1 to 1.2.2 (#17197)

Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.2.1 to 1.2.2.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.1...v1.2.2)

---
updated-dependencies:
- dependency-name: kaminari
  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>
4 years agoBump rubocop-rails from 2.12.4 to 2.13.0 (#17195)
dependabot[bot] [Thu, 6 Jan 2022 00:51:46 +0000 (09:51 +0900)]
Bump rubocop-rails from 2.12.4 to 2.13.0 (#17195)

Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.12.4 to 2.13.0.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.12.4...v2.13.0)

---
updated-dependencies:
- dependency-name: rubocop-rails
  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>
4 years agoRemove custom emojis on domain purge (#17210)
Jeong Arm [Thu, 30 Dec 2021 07:41:09 +0000 (16:41 +0900)]
Remove custom emojis on domain purge (#17210)

4 years agoFix media descriptions not being used for client-side filtering (#17206)
Claire [Tue, 28 Dec 2021 22:25:50 +0000 (23:25 +0100)]
Fix media descriptions not being used for client-side filtering (#17206)

Fix oversight in #13837

4 years agoMerge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Mon, 27 Dec 2021 15:46:38 +0000 (16:46 +0100)]
Merge pull request #1653 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] Fix tag rendering error in hashtag column settings
Rens Groothuijsen [Sun, 26 Dec 2021 18:22:05 +0000 (19:22 +0100)]
[Glitch] Fix tag rendering error in hashtag column settings

Port e65080181af82c14d3441a0890f2ba0a6fb9cd7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Mon, 27 Dec 2021 14:16:18 +0000 (15:16 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.

4 years agoFix warnings on Rails boot (#16946)
Eugen Rochko [Sun, 26 Dec 2021 23:47:20 +0000 (00:47 +0100)]
Fix warnings on Rails boot (#16946)

4 years agoFix tag rendering error in hashtag column settings (#17184)
Rens Groothuijsen [Sun, 26 Dec 2021 18:22:05 +0000 (19:22 +0100)]
Fix tag rendering error in hashtag column settings (#17184)

* Flatten tags in configuration to regular array before converting to JSON

* Render filter tags using toJS instead of toJSON

4 years agoModify Readme syntax (#17112)
Zach Neill [Sat, 25 Dec 2021 21:55:31 +0000 (16:55 -0500)]
Modify Readme syntax (#17112)

* Modify syntax

* Change ** bold to ### header

* Revert license edit

4 years agoFinish update of node-redis (#17183)
Lerk [Sat, 25 Dec 2021 21:55:06 +0000 (21:55 +0000)]
Finish update of node-redis (#17183)

* fix streaming redis client

* use console.error instead of console.log

* follow node-redis migration guide

https://github.com/redis/node-redis/blob/master/docs/v3-to-v4.md

* fix config options for node-redis

* keep indentation

* Update streaming/index.js

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
4 years agoSave bundle config as local (#17188)
Jeong Arm [Sat, 25 Dec 2021 21:52:24 +0000 (06:52 +0900)]
Save bundle config as local (#17188)

Some bundle options are saved as global user config and not project local.
Specially, `deployment` must be saved as local config to be run on copied environment

4 years agoAdd ReadWritePaths directive to service files (#17178)
Lerk [Wed, 22 Dec 2021 03:34:12 +0000 (03:34 +0000)]
Add ReadWritePaths directive to service files (#17178)

* Update mastodon-web.service

* Update mastodon-streaming.service

* Update mastodon-sidekiq.service

4 years agoBump redis from 3.1.2 to 4.0.1 (#17161)
dependabot[bot] [Tue, 21 Dec 2021 02:28:00 +0000 (11:28 +0900)]
Bump redis from 3.1.2 to 4.0.1 (#17161)

Bumps [redis](https://github.com/redis/node-redis) from 3.1.2 to 4.0.1.
- [Release notes](https://github.com/redis/node-redis/releases)
- [Changelog](https://github.com/redis/node-redis/blob/master/.release-it.json)
- [Commits](https://github.com/redis/node-redis/compare/v3.1.2...redis@4.0.1)

---
updated-dependencies:
- dependency-name: redis
  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>
4 years agoBump bullet from 6.1.5 to 7.0.0 (#17154)
dependabot[bot] [Tue, 21 Dec 2021 01:58:59 +0000 (10:58 +0900)]
Bump bullet from 6.1.5 to 7.0.0 (#17154)

Bumps [bullet](https://github.com/flyerhzm/bullet) from 6.1.5 to 7.0.0.
- [Release notes](https://github.com/flyerhzm/bullet/releases)
- [Changelog](https://github.com/flyerhzm/bullet/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flyerhzm/bullet/compare/6.1.5...7.0.0)

---
updated-dependencies:
- dependency-name: bullet
  dependency-type: direct:development
  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>
4 years agoBump npmlog from 5.0.1 to 6.0.0 (#17026)
dependabot[bot] [Tue, 21 Dec 2021 01:57:25 +0000 (10:57 +0900)]
Bump npmlog from 5.0.1 to 6.0.0 (#17026)

Bumps [npmlog](https://github.com/npm/npmlog) from 5.0.1 to 6.0.0.
- [Release notes](https://github.com/npm/npmlog/releases)
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/npmlog/compare/v5.0.1...v6.0.0)

---
updated-dependencies:
- dependency-name: npmlog
  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>
4 years agoBump eslint-plugin-promise from 5.1.1 to 6.0.0 (#17173)
dependabot[bot] [Tue, 21 Dec 2021 01:55:38 +0000 (10:55 +0900)]
Bump eslint-plugin-promise from 5.1.1 to 6.0.0 (#17173)

Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 5.1.1 to 6.0.0.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/development/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-promise
  dependency-type: direct:development
  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>
4 years agoBump @babel/plugin-transform-runtime from 7.16.4 to 7.16.5 (#17164)
dependabot[bot] [Tue, 21 Dec 2021 01:54:54 +0000 (10:54 +0900)]
Bump @babel/plugin-transform-runtime from 7.16.4 to 7.16.5 (#17164)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.4 to 7.16.5.
- [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.5/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>
4 years agoBump sass from 1.45.0 to 1.45.1 (#17174)
dependabot[bot] [Tue, 21 Dec 2021 01:12:18 +0000 (10:12 +0900)]
Bump sass from 1.45.0 to 1.45.1 (#17174)

Bumps [sass](https://github.com/sass/dart-sass) from 1.45.0 to 1.45.1.
- [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.45.0...1.45.1)

---
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>
4 years agoBump @babel/preset-env from 7.16.4 to 7.16.5 (#17169)
dependabot[bot] [Tue, 21 Dec 2021 01:11:48 +0000 (10:11 +0900)]
Bump @babel/preset-env from 7.16.4 to 7.16.5 (#17169)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.4 to 7.16.5.
- [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.5/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>
4 years agoBump @babel/runtime from 7.16.3 to 7.16.5 (#17170)
dependabot[bot] [Tue, 21 Dec 2021 01:11:24 +0000 (10:11 +0900)]
Bump @babel/runtime from 7.16.3 to 7.16.5 (#17170)

Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime) from 7.16.3 to 7.16.5.
- [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.5/packages/babel-runtime)

---
updated-dependencies:
- dependency-name: "@babel/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>
4 years agoBump @babel/core from 7.16.0 to 7.16.5 (#17168)
dependabot[bot] [Tue, 21 Dec 2021 01:11:05 +0000 (10:11 +0900)]
Bump @babel/core from 7.16.0 to 7.16.5 (#17168)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.16.0 to 7.16.5.
- [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.5/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>
4 years agoBump pghero from 2.8.1 to 2.8.2 (#17165)
dependabot[bot] [Tue, 21 Dec 2021 01:10:45 +0000 (10:10 +0900)]
Bump pghero from 2.8.1 to 2.8.2 (#17165)

Bumps [pghero](https://github.com/ankane/pghero) from 2.8.1 to 2.8.2.
- [Release notes](https://github.com/ankane/pghero/releases)
- [Changelog](https://github.com/ankane/pghero/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/pghero/compare/v2.8.1...v2.8.2)

---
updated-dependencies:
- dependency-name: pghero
  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>
4 years agoBump @babel/plugin-transform-react-inline-elements from 7.16.0 to 7.16.5 (#17162)
dependabot[bot] [Tue, 21 Dec 2021 01:09:34 +0000 (10:09 +0900)]
Bump @babel/plugin-transform-react-inline-elements from 7.16.0 to 7.16.5 (#17162)

Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.16.0 to 7.16.5.
- [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.5/packages/babel-plugin-transform-react-inline-elements)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-react-inline-elements"
  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>
4 years agoBump babel-jest from 27.4.0 to 27.4.5 (#17132)
dependabot[bot] [Tue, 21 Dec 2021 01:09:09 +0000 (10:09 +0900)]
Bump babel-jest from 27.4.0 to 27.4.5 (#17132)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 27.4.0 to 27.4.5.
- [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.5/packages/babel-jest)

---
updated-dependencies:
- dependency-name: babel-jest
  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>
4 years agoBump express from 4.17.1 to 4.17.2 (#17171)
dependabot[bot] [Tue, 21 Dec 2021 00:39:21 +0000 (09:39 +0900)]
Bump express from 4.17.1 to 4.17.2 (#17171)

Bumps [express](https://github.com/expressjs/express) from 4.17.1 to 4.17.2.
- [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.17.1...4.17.2)

---
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>
4 years agoBump @babel/preset-react from 7.16.0 to 7.16.5 (#17167)
dependabot[bot] [Tue, 21 Dec 2021 00:38:53 +0000 (09:38 +0900)]
Bump @babel/preset-react from 7.16.0 to 7.16.5 (#17167)

Bumps [@babel/preset-react](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-react) from 7.16.0 to 7.16.5.
- [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.5/packages/babel-preset-react)

---
updated-dependencies:
- dependency-name: "@babel/preset-react"
  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>
4 years agoBump @babel/plugin-proposal-decorators from 7.16.4 to 7.16.5 (#17163)
dependabot[bot] [Tue, 21 Dec 2021 00:38:29 +0000 (09:38 +0900)]
Bump @babel/plugin-proposal-decorators from 7.16.4 to 7.16.5 (#17163)

Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.4 to 7.16.5.
- [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.5/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>
4 years agoBump strong_migrations from 0.7.8 to 0.7.9 (#17166)
dependabot[bot] [Tue, 21 Dec 2021 00:38:06 +0000 (09:38 +0900)]
Bump strong_migrations from 0.7.8 to 0.7.9 (#17166)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.7.8 to 0.7.9.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.8...v0.7.9)

---
updated-dependencies:
- dependency-name: strong_migrations
  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>
4 years agoBump fabrication from 2.22.0 to 2.23.1 (#17160)
dependabot[bot] [Tue, 21 Dec 2021 00:37:42 +0000 (09:37 +0900)]
Bump fabrication from 2.22.0 to 2.23.1 (#17160)

Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.22.0 to 2.23.1.
- [Release notes](https://github.com/paulelliott/fabrication/releases)
- [Changelog](https://github.com/paulelliott/fabrication/blob/master/Changelog.markdown)
- [Commits](https://github.com/paulelliott/fabrication/commits)

---
updated-dependencies:
- dependency-name: fabrication
  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>
4 years agoBump brakeman from 5.1.2 to 5.2.0 (#17158)
dependabot[bot] [Tue, 21 Dec 2021 00:37:25 +0000 (09:37 +0900)]
Bump brakeman from 5.1.2 to 5.2.0 (#17158)

Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 5.1.2 to 5.2.0.
- [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.1.2...v5.2.0)

---
updated-dependencies:
- dependency-name: brakeman
  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>
4 years agoBump fastimage from 2.2.5 to 2.2.6 (#17157)
dependabot[bot] [Tue, 21 Dec 2021 00:36:53 +0000 (09:36 +0900)]
Bump fastimage from 2.2.5 to 2.2.6 (#17157)

Bumps [fastimage](https://github.com/sdsykes/fastimage) from 2.2.5 to 2.2.6.
- [Release notes](https://github.com/sdsykes/fastimage/releases)
- [Changelog](https://github.com/sdsykes/fastimage/blob/master/CHANGELOG)
- [Commits](https://github.com/sdsykes/fastimage/compare/v2.2.5...v2.2.6)

---
updated-dependencies:
- dependency-name: fastimage
  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>
4 years agoBump discard from 1.2.0 to 1.2.1 (#17156)
dependabot[bot] [Tue, 21 Dec 2021 00:36:35 +0000 (09:36 +0900)]
Bump discard from 1.2.0 to 1.2.1 (#17156)

Bumps [discard](https://github.com/jhawthorn/discard) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/jhawthorn/discard/releases)
- [Changelog](https://github.com/jhawthorn/discard/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jhawthorn/discard/commits/v1.2.1)

---
updated-dependencies:
- dependency-name: discard
  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>
4 years agoBump sass from 1.43.5 to 1.45.0 (#17131)
dependabot[bot] [Tue, 21 Dec 2021 00:24:34 +0000 (09:24 +0900)]
Bump sass from 1.43.5 to 1.45.0 (#17131)

Bumps [sass](https://github.com/sass/dart-sass) from 1.43.5 to 1.45.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.43.5...1.45.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>
4 years agoBump jest from 27.4.3 to 27.4.5 (#17130)
dependabot[bot] [Tue, 21 Dec 2021 00:23:58 +0000 (09:23 +0900)]
Bump jest from 27.4.3 to 27.4.5 (#17130)

Bumps [jest](https://github.com/facebook/jest) from 27.4.3 to 27.4.5.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.4.3...v27.4.5)

---
updated-dependencies:
- dependency-name: jest
  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>
4 years agoBump oj from 3.13.9 to 3.13.10 (#17129)
dependabot[bot] [Tue, 21 Dec 2021 00:23:28 +0000 (09:23 +0900)]
Bump oj from 3.13.9 to 3.13.10 (#17129)

Bumps [oj](https://github.com/ohler55/oj) from 3.13.9 to 3.13.10.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.13.9...v3.13.10)

---
updated-dependencies:
- dependency-name: oj
  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>
4 years agoBump devise from 4.8.0 to 4.8.1 (#17155)
dependabot[bot] [Tue, 21 Dec 2021 00:22:58 +0000 (09:22 +0900)]
Bump devise from 4.8.0 to 4.8.1 (#17155)

Bumps [devise](https://github.com/heartcombo/devise) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: devise
  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>
4 years agoBump sprockets-rails from 3.4.1 to 3.4.2 (#17128)
dependabot[bot] [Tue, 21 Dec 2021 00:22:27 +0000 (09:22 +0900)]
Bump sprockets-rails from 3.4.1 to 3.4.2 (#17128)

Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.1...v3.4.2)

---
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>
4 years agoBump yargs from 17.2.1 to 17.3.0 (#17102)
dependabot[bot] [Tue, 21 Dec 2021 00:19:51 +0000 (09:19 +0900)]
Bump yargs from 17.2.1 to 17.3.0 (#17102)

Bumps [yargs](https://github.com/yargs/yargs) from 17.2.1 to 17.3.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v17.2.1...v17.3.0)

---
updated-dependencies:
- dependency-name: yargs
  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>
4 years agoBump aws-sdk-s3 from 1.107.0 to 1.109.0 (#17101)
dependabot[bot] [Tue, 21 Dec 2021 00:19:29 +0000 (09:19 +0900)]
Bump aws-sdk-s3 from 1.107.0 to 1.109.0 (#17101)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.107.0 to 1.109.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>
4 years agoBump sidekiq-unique-jobs from 7.1.8 to 7.1.12 (#17100)
dependabot[bot] [Tue, 21 Dec 2021 00:17:45 +0000 (09:17 +0900)]
Bump sidekiq-unique-jobs from 7.1.8 to 7.1.12 (#17100)

Bumps [sidekiq-unique-jobs](https://mhenrixon.github.io/sidekiq-unique-jobs) from 7.1.8 to 7.1.12.

---
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>
4 years agoBump @testing-library/jest-dom from 5.16.0 to 5.16.1 (#17106)
dependabot[bot] [Tue, 21 Dec 2021 00:17:16 +0000 (09:17 +0900)]
Bump @testing-library/jest-dom from 5.16.0 to 5.16.1 (#17106)

Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.16.0 to 5.16.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.16.0...v5.16.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>
4 years agoFix duplicate record on admin/accounts when searching with IP (#17150)
Jeong Arm [Mon, 20 Dec 2021 23:17:14 +0000 (08:17 +0900)]
Fix duplicate record on admin/accounts when searching with IP (#17150)

4 years agoMerge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Sat, 18 Dec 2021 12:17:37 +0000 (13:17 +0100)]
Merge pull request #1650 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years agoRevert "Change workflow to push to Docker Hub (#16980)"
Claire [Sat, 18 Dec 2021 10:57:42 +0000 (11:57 +0100)]
Revert "Change workflow to push to Docker Hub (#16980)"

This reverts commit 4b616c4f0a2158883034cd756391bd70265b787d.

4 years ago[Glitch] Change title of retention chart
Claire [Fri, 17 Dec 2021 22:00:41 +0000 (23:00 +0100)]
[Glitch] Change title of retention chart

Port 0c17fd91091fd2f230224d5fce218688d480502c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years agoMerge branch 'main' into glitch-soc/merge-upstream
Claire [Sat, 18 Dec 2021 10:44:54 +0000 (11:44 +0100)]
Merge branch 'main' into glitch-soc/merge-upstream

4 years agoAdd ability for admins to delete canonical email blocks (#16644)
Claire [Fri, 17 Dec 2021 22:02:14 +0000 (23:02 +0100)]
Add ability for admins to delete canonical email blocks (#16644)

* Add admin option to remove canonical email blocks from a deleted account

* Add tootctl canonical_email_blocks to inspect and remove canonical email blocks

4 years agoAdd ability to purge undeliverable domains from admin interface (#16686)
Claire [Fri, 17 Dec 2021 22:01:21 +0000 (23:01 +0100)]
Add ability to purge undeliverable domains from admin interface (#16686)

* Add ability to purge undeliverable domains from admin interface

* Add tests

4 years agoChange title of retention chart (#16909)
Claire [Fri, 17 Dec 2021 22:00:41 +0000 (23:00 +0100)]
Change title of retention chart (#16909)

Changes from “Retention” to “User retention rate by month after sign-up”.
This should make it much clearer to people not familiar with retention charts
what it actually means.

4 years agoChange list title input styling (#17092)
Claire [Fri, 17 Dec 2021 22:00:05 +0000 (23:00 +0100)]
Change list title input styling (#17092)

4 years agoMerge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream
Claire [Thu, 16 Dec 2021 18:45:17 +0000 (19:45 +0100)]
Merge pull request #1648 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

4 years ago[Glitch] ignore hashtag suggestions if they vary only in case
David Sterry [Wed, 15 Dec 2021 22:47:19 +0000 (14:47 -0800)]
[Glitch] ignore hashtag suggestions if they vary only in case

Port 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
4 years ago[Glitch] Show correct error message if chosen password is too long
Rens Groothuijsen [Sun, 5 Dec 2021 20:49:50 +0000 (21:49 +0100)]
[Glitch] Show correct error message if chosen password is too long

Port 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>