]> cat aescling's git repositories - mastodon.git/log
mastodon.git
5 years ago[Glitch] Fix uninformative error message when uploading unsupported image files
ThibG [Sat, 25 Apr 2020 10:27:29 +0000 (12:27 +0200)]
[Glitch] Fix uninformative error message when uploading unsupported image files

Port be637146f310d7ec3a49d01e850959514e9e4964 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix expanded video player issues
ThibG [Sat, 25 Apr 2020 10:16:05 +0000 (12:16 +0200)]
[Glitch] Fix expanded video player issues

Port c955f98d36868e85b0f1939a3a1c58c00babd4e8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Set max-width and max-height to gif video
Irie Aoi [Thu, 23 Apr 2020 13:49:33 +0000 (22:49 +0900)]
[Glitch] Set max-width and max-height to gif video

Port c5c8f680317a182c4794505007ef227a4294a18e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago[Glitch] Fix and refactor keyboard navigation in dropdown menus
ThibG [Tue, 21 Apr 2020 13:13:26 +0000 (15:13 +0200)]
[Glitch] Fix and refactor keyboard navigation in dropdown menus

Port 80182eda622e1317bffb6729259b8a81d84251a2 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 25 Apr 2020 13:19:32 +0000 (15:19 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoFix uninformative error message when uploading unsupported image files (#13540)
ThibG [Sat, 25 Apr 2020 10:27:29 +0000 (12:27 +0200)]
Fix uninformative error message when uploading unsupported image files (#13540)

Attempting to upload image files that the browser is unable to load results
in “Oops! An unexpected error occurred.”

This commit changes the error handling so that an unprocessable image results
in the file being sent anyway, which might cover a few corner cases, and
provide a slightly better error message.

5 years agoFix expanded video player issues (#13541)
ThibG [Sat, 25 Apr 2020 10:16:05 +0000 (12:16 +0200)]
Fix expanded video player issues (#13541)

Fixes #13536

- Expanding a paused video doesn't autoplay anymore
- Default volume level for the expanded video inherited from the original video

Position/playing state/volume are carried over from the original video player
to the modal, but they're not reported back to the modal as it would require
deeper changes.

5 years agoFix enable/disable relay failures (#13535)
Takeshi Umeda [Thu, 23 Apr 2020 20:04:18 +0000 (05:04 +0900)]
Fix enable/disable relay failures (#13535)

5 years agoSet max-width and max-height to gif video (#13533)
Irie Aoi [Thu, 23 Apr 2020 13:49:33 +0000 (22:49 +0900)]
Set max-width and max-height to gif video (#13533)

5 years agoFix and refactor keyboard navigation in dropdown menus (#13528)
ThibG [Tue, 21 Apr 2020 13:13:26 +0000 (15:13 +0200)]
Fix and refactor keyboard navigation in dropdown menus (#13528)

Fixes #13527

- Fixes caught keyboard events being needlessly propagated
- Let up/down arrows wrap around like the tab key does
- Refactor common code

5 years agoMerge pull request #1320 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 20 Apr 2020 16:25:18 +0000 (18:25 +0200)]
Merge pull request #1320 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoBump parser from 2.7.1.0 to 2.7.1.1 (#13508)
dependabot-preview[bot] [Mon, 20 Apr 2020 15:05:08 +0000 (00:05 +0900)]
Bump parser from 2.7.1.0 to 2.7.1.1 (#13508)

Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.0 to 2.7.1.1.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.0...v2.7.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump globule from 1.2.1 to 1.3.1 (#13521)
dependabot-preview[bot] [Mon, 20 Apr 2020 15:00:34 +0000 (00:00 +0900)]
Bump globule from 1.2.1 to 1.3.1 (#13521)

Bumps [globule](https://github.com/cowboy/node-globule) from 1.2.1 to 1.3.1.
- [Release notes](https://github.com/cowboy/node-globule/releases)
- [Commits](https://github.com/cowboy/node-globule/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump stream-shift from 1.0.0 to 1.0.1 (#13522)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:58:35 +0000 (23:58 +0900)]
Bump stream-shift from 1.0.0 to 1.0.1 (#13522)

Bumps [stream-shift](https://github.com/mafintosh/stream-shift) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/mafintosh/stream-shift/releases)
- [Commits](https://github.com/mafintosh/stream-shift/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump redis-actionpack from 5.0.2 to 5.2.0 (#13510)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:57:04 +0000 (23:57 +0900)]
Bump redis-actionpack from 5.0.2 to 5.2.0 (#13510)

Bumps [redis-actionpack](http://redis-store.org/redis-actionpack) from 5.0.2 to 5.2.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump uuid from 7.0.2 to 7.0.3 (#13520)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:55:32 +0000 (23:55 +0900)]
Bump uuid from 7.0.2 to 7.0.3 (#13520)

Bumps [uuid](https://github.com/uuidjs/uuid) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/master/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v7.0.2...v7.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago[Glitch] Update Twemoji to 12.1.5
D Anzorge [Sun, 19 Apr 2020 21:38:31 +0000 (23:38 +0200)]
[Glitch] Update Twemoji to 12.1.5

Port emoji_map.json changes from 29f5353f8b7af331d6dddea4ee1888913361a545 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoBump sisteransi from 1.0.0 to 1.0.5 (#13523)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:53:18 +0000 (23:53 +0900)]
Bump sisteransi from 1.0.0 to 1.0.5 (#13523)

Bumps [sisteransi](https://github.com/terkelg/sisteransi) from 1.0.0 to 1.0.5.
- [Release notes](https://github.com/terkelg/sisteransi/releases)
- [Commits](https://github.com/terkelg/sisteransi/compare/v1.0.0...v1.0.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years ago[Glitch] Add local only to hashtag timeline
Takeshi Umeda [Sat, 18 Apr 2020 19:52:39 +0000 (04:52 +0900)]
[Glitch] Add local only to hashtag timeline

Port front-end changes from 2c7128c7f0ee3073acb9897cda88255982368193 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoBump signal-exit from 3.0.2 to 3.0.3 (#13519)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:50:57 +0000 (23:50 +0900)]
Bump signal-exit from 3.0.2 to 3.0.3 (#13519)

Bumps [signal-exit](https://github.com/tapjs/signal-exit) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/tapjs/signal-exit/releases)
- [Changelog](https://github.com/tapjs/signal-exit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tapjs/signal-exit/compare/v3.0.2...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 20 Apr 2020 14:45:40 +0000 (16:45 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoBump pako from 1.0.10 to 1.0.11 (#13518)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:43:58 +0000 (23:43 +0900)]
Bump pako from 1.0.10 to 1.0.11 (#13518)

Bumps [pako](https://github.com/nodeca/pako) from 1.0.10 to 1.0.11.
- [Release notes](https://github.com/nodeca/pako/releases)
- [Changelog](https://github.com/nodeca/pako/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/pako/compare/1.0.10...1.0.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump nokogumbo from 2.0.1 to 2.0.2 (#13509)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:33:55 +0000 (23:33 +0900)]
Bump nokogumbo from 2.0.1 to 2.0.2 (#13509)

Bumps [nokogumbo](https://github.com/rubys/nokogumbo) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/rubys/nokogumbo/releases)
- [Changelog](https://github.com/rubys/nokogumbo/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubys/nokogumbo/compare/v2.0.1...v2.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump excon from 0.71.0 to 0.73.0 (#13507)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:24:35 +0000 (23:24 +0900)]
Bump excon from 0.71.0 to 0.73.0 (#13507)

Bumps [excon](https://github.com/excon/excon) from 0.71.0 to 0.73.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.71.0...v0.73.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump redis-rack from 2.0.4 to 2.1.2 (#13512)
dependabot-preview[bot] [Mon, 20 Apr 2020 14:05:09 +0000 (23:05 +0900)]
Bump redis-rack from 2.0.4 to 2.1.2 (#13512)

Bumps [redis-rack](http://redis-store.org/redis-rack) from 2.0.4 to 2.1.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump rqrcode_core from 0.1.1 to 0.1.2 (#13506)
dependabot-preview[bot] [Mon, 20 Apr 2020 13:29:14 +0000 (22:29 +0900)]
Bump rqrcode_core from 0.1.1 to 0.1.2 (#13506)

Bumps [rqrcode_core](https://github.com/whomwah/rqrcode_core) from 0.1.1 to 0.1.2.
- [Release notes](https://github.com/whomwah/rqrcode_core/releases)
- [Commits](https://github.com/whomwah/rqrcode_core/commits/v0.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump aws-sigv4 from 1.1.1 to 1.1.2 (#13513)
dependabot-preview[bot] [Mon, 20 Apr 2020 13:24:40 +0000 (22:24 +0900)]
Bump aws-sigv4 from 1.1.1 to 1.1.2 (#13513)

Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.1 to 1.1.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.1...1.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump axobject-query from 2.0.2 to 2.1.2 (#13514)
dependabot-preview[bot] [Mon, 20 Apr 2020 13:22:06 +0000 (22:22 +0900)]
Bump axobject-query from 2.0.2 to 2.1.2 (#13514)

Bumps [axobject-query](https://github.com/A11yance/axobject-query) from 2.0.2 to 2.1.2.
- [Release notes](https://github.com/A11yance/axobject-query/releases)
- [Changelog](https://github.com/A11yance/axobject-query/blob/master/CHANGELOG.md)
- [Commits](https://github.com/A11yance/axobject-query/compare/v2.0.2...v2.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump console-browserify from 1.1.0 to 1.2.0 (#13515)
dependabot-preview[bot] [Mon, 20 Apr 2020 13:18:04 +0000 (22:18 +0900)]
Bump console-browserify from 1.1.0 to 1.2.0 (#13515)

Bumps [console-browserify](https://github.com/browserify/console-browserify) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/browserify/console-browserify/releases)
- [Changelog](https://github.com/browserify/console-browserify/blob/master/CHANGELOG.md)
- [Commits](https://github.com/browserify/console-browserify/compare/v1.1.0...v1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump css-what from 2.1.2 to 2.1.3 (#13516)
dependabot-preview[bot] [Mon, 20 Apr 2020 13:15:03 +0000 (22:15 +0900)]
Bump css-what from 2.1.2 to 2.1.3 (#13516)

Bumps [css-what](https://github.com/fb55/css-what) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/fb55/css-what/releases)
- [Commits](https://github.com/fb55/css-what/compare/v2.1.2...v2.1.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoAllow users to delete their header and avatar (#13234)
sternenseemann [Mon, 20 Apr 2020 12:03:03 +0000 (14:03 +0200)]
Allow users to delete their header and avatar (#13234)

This is achieved by sending a DELETE request to
/settings/profile/pictures/{avatar,header} via a link that is part of
the upload form's hint of the respective picture.

5 years agoUpdate Twemoji to 12.1.5 (#13021)
D Anzorge [Sun, 19 Apr 2020 21:38:31 +0000 (23:38 +0200)]
Update Twemoji to 12.1.5 (#13021)

* Update Twemoji to 12.1.5

SVGs from Twemoji repo https://github.com/twitter/twemoji

* Update emoji_map.json to Unicode 12

5 years agoAdd local only to hashtag timeline (#13502)
Takeshi Umeda [Sat, 18 Apr 2020 19:52:39 +0000 (04:52 +0900)]
Add local only to hashtag timeline (#13502)

5 years agoMerge pull request #1319 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 18 Apr 2020 14:22:31 +0000 (16:22 +0200)]
Merge pull request #1319 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix uploaded image orientation in some browsers
ThibG [Sat, 18 Apr 2020 13:37:03 +0000 (15:37 +0200)]
[Glitch] Fix uploaded image orientation in some browsers

Port a1ce9cbb67facf705379355b9c8ec19c521b419c to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 18 Apr 2020 13:47:32 +0000 (15:47 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoFix uploaded image orientation in some browsers (#13493)
ThibG [Sat, 18 Apr 2020 13:37:03 +0000 (15:37 +0200)]
Fix uploaded image orientation in some browsers (#13493)

Some browsers (at least recent Chrome versions) automatically take
image metadata into account when drawing images into a canvas.
There seem to be no way to prevent that behavior, and the only
way to detect it seems to compare with a known image.

See: https://github.com/w3c/csswg-drafts/issues/4666
Solution adapted from: https://github.com/blueimp/JavaScript-Load-Image/commit/1e4df707821a0afcc11ea0720ee403b8759f3881

5 years agoMerge pull request #1318 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 17 Apr 2020 20:36:48 +0000 (22:36 +0200)]
Merge pull request #1318 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix not being able to vote
ThibG [Fri, 17 Apr 2020 19:54:25 +0000 (21:54 +0200)]
[Glitch] Fix not being able to vote

Port e12a5635da7de5a1c3b08b2ce420ee8a56ae4aff to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 17 Apr 2020 20:02:55 +0000 (22:02 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoFix not being able to vote (#13490)
ThibG [Fri, 17 Apr 2020 19:54:25 +0000 (21:54 +0200)]
Fix not being able to vote (#13490)

Fix regression introduced by ab8d7c0680d7f75826277be4c8eea1ebd396be8a

5 years ago[Glitch] Fix Poll fetchPoll action not being debounced.
Gurgen Hayrapetyan [Thu, 16 Apr 2020 18:16:20 +0000 (22:16 +0400)]
[Glitch] Fix Poll fetchPoll action not being debounced.

Port ab8d7c0680d7f75826277be4c8eea1ebd396be8a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 17 Apr 2020 18:16:24 +0000 (20:16 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

5 years agoFix admin actions log crash when displaying updates of deleted announcements (#13489)
ThibG [Fri, 17 Apr 2020 17:54:58 +0000 (19:54 +0200)]
Fix admin actions log crash when displaying updates of deleted announcements (#13489)

Fixes #13487

5 years agoFix search not working due to proxy settings when using hidden services (#13488)
Eugen Rochko [Fri, 17 Apr 2020 13:14:24 +0000 (15:14 +0200)]
Fix search not working due to proxy settings when using hidden services (#13488)

Fix #13484

5 years agoFix Poll fetchPoll action not being debounced. (#13485)
Gurgen Hayrapetyan [Thu, 16 Apr 2020 18:16:20 +0000 (22:16 +0400)]
Fix Poll fetchPoll action not being debounced. (#13485)

* Fix Poll fetchPoll action not being debounced.

* Fix unused import in the Poll component

5 years agoFix DeliveryWorker not to call failure_tracker when inbox_url is unavailable (#13482)
Takeshi Umeda [Thu, 16 Apr 2020 06:04:10 +0000 (15:04 +0900)]
Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable (#13482)

5 years agoFix migration 20200407202420_migrate_unavailable_inboxes (#13481)
Takeshi Umeda [Thu, 16 Apr 2020 06:03:24 +0000 (15:03 +0900)]
Fix migration 20200407202420_migrate_unavailable_inboxes (#13481)

5 years agoFix confusing error when failing to add an alias to an unknown account (#13480)
ThibG [Wed, 15 Apr 2020 18:33:53 +0000 (20:33 +0200)]
Fix confusing error when failing to add an alias to an unknown account (#13480)

Follow-up to #13452, fixing broken `uri.nil?` test.

Also remove the separate check for `uri` presence, as that would result
in a “Please review 2 errors below” while only one would be listed.

5 years agoChange delivery failure tracking to work with hostnames instead of URLs (#13437)
Eugen Rochko [Wed, 15 Apr 2020 18:33:24 +0000 (20:33 +0200)]
Change delivery failure tracking to work with hostnames instead of URLs (#13437)

5 years agoMerge pull request #1317 from ThibG/glitch-soc/merge-upstream
ThibG [Wed, 15 Apr 2020 16:24:41 +0000 (18:24 +0200)]
Merge pull request #1317 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Wed, 15 Apr 2020 15:07:49 +0000 (17:07 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `package.json`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.
- `yarn.lock`:
  No real conflict, upstream updated a dependency which is
  textually adjacent to a glitch-soc-specific dependency.
  Updated it.

5 years agoFix “Email changed” notification sometimes having wrong e-mail (#13475)
ThibG [Wed, 15 Apr 2020 14:13:44 +0000 (16:13 +0200)]
Fix “Email changed” notification sometimes having wrong e-mail (#13475)

* Fix “Email changed” notification sometimes having wrong e-mail

Fixes #6778

The root of the issue is that `send_devise_notification` was called before
the changes were properly commited to the database, causing the mailer to
pick previous values if running too early.

Devise's documentation provides guidance on how to handle that[1][2], however,
I have found it to not be working, as the following happens, in that order:
- `send_devise_notification` is called for the `email_changed` notification.
  In that case, `changed?` is false and `saved_changes?` is true, so
  if we use the former, we have the same issue.
- the `after_commit` hook is called
- `send_devise_notification` is called for the `confirmation_instructions`
  notification.
  In that case, `changed?` is still false, and `saved_changes?` still true,
  so if we use the latter, that second notification email is simply not
  going to be sent (as we would be queuing the notification *after*
  executing the after_commit hook).

This is because it may be called from either an `after_update` or
`after_commit` hook, the difference not being a call to `save` but the
transaction actually being committed to the database. This may arguably
be a bug in Devise, or Devise's notification.

The proposed workaround is inspired by Devise's documentation but checks
whether a transaction is open to make the call whether to immediately
send the notification or defer it to the `after_commit` hook.

[1]: https://www.rubydoc.info/github/plataformatec/devise/Devise%2FModels%2FAuthenticatable:send_devise_notification
[2]: https://github.com/heartcombo/devise/blob/406915cb781e38255a30ad2a0609e33952b9ec50/lib/devise/models/authenticatable.rb#L133-L194

* Fix cases when sending notifications without changing the model

* Defer sending if and only if in transaction including current record

5 years agoBump watchpack from 1.6.0 to 1.6.1 (#13462)
dependabot-preview[bot] [Mon, 13 Apr 2020 15:35:20 +0000 (00:35 +0900)]
Bump watchpack from 1.6.0 to 1.6.1 (#13462)

Bumps [watchpack](https://github.com/webpack/watchpack) from 1.6.0 to 1.6.1.
- [Release notes](https://github.com/webpack/watchpack/releases)
- [Commits](https://github.com/webpack/watchpack/compare/v1.6.0...v1.6.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump regexp_parser from 1.6.0 to 1.7.0 (#13460)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:40:22 +0000 (23:40 +0900)]
Bump regexp_parser from 1.6.0 to 1.7.0 (#13460)

Bumps [regexp_parser](https://github.com/ammar/regexp_parser) from 1.6.0 to 1.7.0.
- [Release notes](https://github.com/ammar/regexp_parser/releases)
- [Changelog](https://github.com/ammar/regexp_parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ammar/regexp_parser/compare/v1.6.0...v1.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump rubocop-rails from 2.4.2 to 2.5.2 (#13459)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:36:57 +0000 (23:36 +0900)]
Bump rubocop-rails from 2.4.2 to 2.5.2 (#13459)

Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.2 to 2.5.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump capistrano from 3.12.1 to 3.13.0 (#13455)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:33:53 +0000 (23:33 +0900)]
Bump capistrano from 3.12.1 to 3.13.0 (#13455)

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.12.1 to 3.13.0.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.12.1...v3.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump elasticsearch from 7.5.0 to 7.6.0 (#13458)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:21:31 +0000 (23:21 +0900)]
Bump elasticsearch from 7.5.0 to 7.6.0 (#13458)

Bumps [elasticsearch](https://github.com/elasticsearch/elasticsearch-ruby) from 7.5.0 to 7.6.0.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases)
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/v7.6.0/CHANGELOG.md)
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v7.5.0...v7.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump cssom from 0.3.4 to 0.3.8 (#13461)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:20:30 +0000 (23:20 +0900)]
Bump cssom from 0.3.4 to 0.3.8 (#13461)

Bumps [cssom](https://github.com/NV/CSSOM) from 0.3.4 to 0.3.8.
- [Release notes](https://github.com/NV/CSSOM/releases)
- [Commits](https://github.com/NV/CSSOM/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump regexp.prototype.flags from 1.2.0 to 1.3.0 (#13468)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:18:01 +0000 (23:18 +0900)]
Bump regexp.prototype.flags from 1.2.0 to 1.3.0 (#13468)

Bumps [regexp.prototype.flags](https://github.com/es-shims/RegExp.prototype.flags) from 1.2.0 to 1.3.0.
- [Release notes](https://github.com/es-shims/RegExp.prototype.flags/releases)
- [Changelog](https://github.com/es-shims/RegExp.prototype.flags/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/RegExp.prototype.flags/compare/v1.2.0...v1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump fabrication from 2.21.0 to 2.21.1 (#13453)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:16:40 +0000 (23:16 +0900)]
Bump fabrication from 2.21.0 to 2.21.1 (#13453)

Bumps [fabrication](https://github.com/paulelliott/fabrication) from 2.21.0 to 2.21.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/compare/2.21.0...2.21.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump aws-sdk-s3 from 1.61.1 to 1.61.2 (#13456)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:16:12 +0000 (23:16 +0900)]
Bump aws-sdk-s3 from 1.61.1 to 1.61.2 (#13456)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.61.1 to 1.61.2.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump mousetrap from 1.6.2 to 1.6.5 (#13466)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:14:37 +0000 (23:14 +0900)]
Bump mousetrap from 1.6.2 to 1.6.5 (#13466)

Bumps [mousetrap](https://github.com/ccampbell/mousetrap) from 1.6.2 to 1.6.5.
- [Release notes](https://github.com/ccampbell/mousetrap/releases)
- [Commits](https://github.com/ccampbell/mousetrap/compare/1.6.2...1.6.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump mkdirp from 1.0.3 to 1.0.4 (#13463)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:11:52 +0000 (23:11 +0900)]
Bump mkdirp from 1.0.3 to 1.0.4 (#13463)

Bumps [mkdirp](https://github.com/isaacs/node-mkdirp) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/isaacs/node-mkdirp/releases)
- [Changelog](https://github.com/isaacs/node-mkdirp/blob/master/CHANGELOG.md)
- [Commits](https://github.com/isaacs/node-mkdirp/compare/v1.0.3...v1.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump unicode-match-property-value-ecmascript from 1.1.0 to 1.2.0 (#13464)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:09:23 +0000 (23:09 +0900)]
Bump unicode-match-property-value-ecmascript from 1.1.0 to 1.2.0 (#13464)

Bumps [unicode-match-property-value-ecmascript](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/releases)
- [Commits](https://github.com/mathiasbynens/unicode-match-property-value-ecmascript/compare/v1.1.0...v1.2.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump picomatch from 2.0.7 to 2.2.2 (#13465)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:08:13 +0000 (23:08 +0900)]
Bump picomatch from 2.0.7 to 2.2.2 (#13465)

Bumps [picomatch](https://github.com/micromatch/picomatch) from 2.0.7 to 2.2.2.
- [Release notes](https://github.com/micromatch/picomatch/releases)
- [Changelog](https://github.com/micromatch/picomatch/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/picomatch/compare/2.0.7...2.2.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump autoprefixer from 9.7.5 to 9.7.6 (#13467)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:06:14 +0000 (23:06 +0900)]
Bump autoprefixer from 9.7.5 to 9.7.6 (#13467)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.7.5 to 9.7.6.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.7.5...9.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump htmlparser2 from 3.10.0 to 3.10.1 (#13469)
dependabot-preview[bot] [Mon, 13 Apr 2020 14:04:15 +0000 (23:04 +0900)]
Bump htmlparser2 from 3.10.0 to 3.10.1 (#13469)

Bumps [htmlparser2](https://github.com/fb55/htmlparser2) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/fb55/htmlparser2/releases)
- [Commits](https://github.com/fb55/htmlparser2/compare/v3.10.0...v3.10.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix account aliases page (#13452)
ThibG [Mon, 13 Apr 2020 04:41:43 +0000 (06:41 +0200)]
Fix account aliases page (#13452)

* Fix error not being displayed when adding an account alias, add error for self-references

Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
* Add “You have no aliases.” note in confusing empty aliases table

Co-Authored-By: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
Co-authored-by: Mélanie Chauvel (ariasuni) <perso@hack-libre.org>
5 years agoMerge pull request #1316 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 12 Apr 2020 15:58:25 +0000 (17:58 +0200)]
Merge pull request #1316 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years ago[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and...
ThibG [Sun, 12 Apr 2020 11:38:00 +0000 (13:38 +0200)]
[Glitch] Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists

Port ec31b1b75244c030bb4fb0ccabac7ff8b626db92 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 12 Apr 2020 14:50:27 +0000 (16:50 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.

5 years agoincrease the postgres container shm_size from 64mb to 256mb (#13451)
Matej Ľach [Sun, 12 Apr 2020 14:41:54 +0000 (15:41 +0100)]
increase the postgres container shm_size from 64mb to 256mb (#13451)

5 years agoFix API footer link in Web UI (#13441)
Leonie [Sun, 12 Apr 2020 11:38:14 +0000 (13:38 +0200)]
Fix API footer link in Web UI (#13441)

Co-authored-by: koyu <me@koyu.spac>
5 years agoFix WebUI pagination of following, followers, follow requests, blocks and mutes lists...
ThibG [Sun, 12 Apr 2020 11:38:00 +0000 (13:38 +0200)]
Fix WebUI pagination of following, followers, follow requests, blocks and mutes lists (#13445)

* Fix following, followers and follow requests pagination

* Fix pagination of blocks and mutes

5 years agoAdd new vagrant log files to .gitignore (#13442)
fuyu [Sun, 12 Apr 2020 11:37:34 +0000 (20:37 +0900)]
Add new vagrant log files to .gitignore (#13442)

* Update .gitignore

* Update .gitignore

Co-Authored-By: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
5 years agoClean up some dead code
Thibaut Girka [Fri, 10 Apr 2020 08:42:31 +0000 (10:42 +0200)]
Clean up some dead code

5 years agoFix translation platform to Crowdin (#13443)
Yamagishi Kazutoshi [Fri, 10 Apr 2020 06:24:23 +0000 (15:24 +0900)]
Fix translation platform to Crowdin (#13443)

5 years agoBump capistrano-bundler from 1.3.0 to 1.6.0 (#13416)
dependabot-preview[bot] [Thu, 9 Apr 2020 18:34:54 +0000 (03:34 +0900)]
Bump capistrano-bundler from 1.3.0 to 1.6.0 (#13416)

Bumps [capistrano-bundler](https://github.com/capistrano/bundler) from 1.3.0 to 1.6.0.
- [Release notes](https://github.com/capistrano/bundler/releases)
- [Changelog](https://github.com/capistrano/bundler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/capistrano/bundler/compare/v1.3.0...v1.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump elasticsearch-dsl from 0.1.8 to 0.1.9 (#13419)
dependabot-preview[bot] [Thu, 9 Apr 2020 18:33:12 +0000 (03:33 +0900)]
Bump elasticsearch-dsl from 0.1.8 to 0.1.9 (#13419)

Bumps [elasticsearch-dsl](https://github.com/elasticsearch/elasticsearch-ruby) from 0.1.8 to 0.1.9.
- [Release notes](https://github.com/elasticsearch/elasticsearch-ruby/releases)
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elasticsearch/elasticsearch-ruby/compare/v0.1.8...v0.1.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump annotate from 3.0.3 to 3.1.1 (#13417)
dependabot-preview[bot] [Thu, 9 Apr 2020 18:32:39 +0000 (03:32 +0900)]
Bump annotate from 3.0.3 to 3.1.1 (#13417)

Bumps [annotate](https://github.com/ctran/annotate_models) from 3.0.3 to 3.1.1.
- [Release notes](https://github.com/ctran/annotate_models/releases)
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ctran/annotate_models/compare/v3.0.3...v3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix deprecated use of createBrowserHistory
Thibaut Girka [Thu, 9 Apr 2020 14:12:28 +0000 (16:12 +0200)]
Fix deprecated use of createBrowserHistory

5 years agoBump babel-plugin-emotion from 10.0.19 to 10.0.33 (#13409)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:22:50 +0000 (03:22 +0900)]
Bump babel-plugin-emotion from 10.0.19 to 10.0.33 (#13409)

Bumps [babel-plugin-emotion](https://github.com/emotion-js/emotion) from 10.0.19 to 10.0.33.
- [Release notes](https://github.com/emotion-js/emotion/releases)
- [Changelog](https://github.com/emotion-js/emotion/blob/master/CHANGELOG.md)
- [Commits](https://github.com/emotion-js/emotion/compare/babel-plugin-emotion@10.0.19...babel-plugin-emotion@10.0.33)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump abab from 2.0.0 to 2.0.3 (#13408)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:17:48 +0000 (03:17 +0900)]
Bump abab from 2.0.0 to 2.0.3 (#13408)

Bumps [abab](https://github.com/jsdom/abab) from 2.0.0 to 2.0.3.
- [Release notes](https://github.com/jsdom/abab/releases)
- [Changelog](https://github.com/jsdom/abab/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jsdom/abab/compare/v2.0.0...2.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump es-abstract from 1.17.0 to 1.17.5 (#13410)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:16:14 +0000 (03:16 +0900)]
Bump es-abstract from 1.17.0 to 1.17.5 (#13410)

Bumps [es-abstract](https://github.com/ljharb/es-abstract) from 1.17.0 to 1.17.5.
- [Release notes](https://github.com/ljharb/es-abstract/releases)
- [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.0...v1.17.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump sshpk from 1.16.0 to 1.16.1 (#13412)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:15:10 +0000 (03:15 +0900)]
Bump sshpk from 1.16.0 to 1.16.1 (#13412)

Bumps [sshpk](https://github.com/joyent/node-sshpk) from 1.16.0 to 1.16.1.
- [Release notes](https://github.com/joyent/node-sshpk/releases)
- [Commits](https://github.com/joyent/node-sshpk/compare/v1.16.0...v1.16.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump thunky from 1.0.3 to 1.1.0 (#13411)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:13:11 +0000 (03:13 +0900)]
Bump thunky from 1.0.3 to 1.1.0 (#13411)

Bumps [thunky](https://github.com/mafintosh/thunky) from 1.0.3 to 1.1.0.
- [Release notes](https://github.com/mafintosh/thunky/releases)
- [Commits](https://github.com/mafintosh/thunky/compare/v1.0.3...v1.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump intl-format-cache from 2.1.0 to 2.2.9 (#13413)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:12:30 +0000 (03:12 +0900)]
Bump intl-format-cache from 2.1.0 to 2.2.9 (#13413)

Bumps [intl-format-cache](https://github.com/formatjs/formatjs) from 2.1.0 to 2.2.9.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-utils@2.1.0...intl-format-cache@2.2.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump escodegen from 1.11.0 to 1.14.1 (#13414)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:10:41 +0000 (03:10 +0900)]
Bump escodegen from 1.11.0 to 1.14.1 (#13414)

Bumps [escodegen](https://github.com/estools/escodegen) from 1.11.0 to 1.14.1.
- [Release notes](https://github.com/estools/escodegen/releases)
- [Commits](https://github.com/estools/escodegen/compare/v1.11.0...v1.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump istanbul-lib-instrument from 3.1.0 to 3.3.0 (#13415)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:08:52 +0000 (03:08 +0900)]
Bump istanbul-lib-instrument from 3.1.0 to 3.3.0 (#13415)

Bumps [istanbul-lib-instrument](https://github.com/istanbuljs/istanbuljs/tree/HEAD/packages/istanbul-lib-instrument) from 3.1.0 to 3.3.0.
- [Release notes](https://github.com/istanbuljs/istanbuljs/releases)
- [Changelog](https://github.com/istanbuljs/istanbuljs/blob/master/packages/istanbul-lib-instrument/CHANGELOG.md)
- [Commits](https://github.com/istanbuljs/istanbuljs/commits/istanbul-lib-instrument@3.3.0/packages/istanbul-lib-instrument)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump prop-types-extra from 1.1.0 to 1.1.1 (#13407)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:07:55 +0000 (03:07 +0900)]
Bump prop-types-extra from 1.1.0 to 1.1.1 (#13407)

Bumps [prop-types-extra](https://github.com/react-bootstrap/prop-types-extra) from 1.1.0 to 1.1.1.
- [Release notes](https://github.com/react-bootstrap/prop-types-extra/releases)
- [Changelog](https://github.com/react-bootstrap/prop-types-extra/blob/master/CHANGELOG.md)
- [Commits](https://github.com/react-bootstrap/prop-types-extra/compare/v1.1.0...v1.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump public_suffix from 4.0.3 to 4.0.4 (#13418)
dependabot-preview[bot] [Wed, 8 Apr 2020 18:01:54 +0000 (03:01 +0900)]
Bump public_suffix from 4.0.3 to 4.0.4 (#13418)

Bumps [public_suffix](https://github.com/weppos/publicsuffix-ruby) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/weppos/publicsuffix-ruby/releases)
- [Changelog](https://github.com/weppos/publicsuffix-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/weppos/publicsuffix-ruby/compare/4.0.3...v4.0.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump bcrypt from 3.1.12 to 3.1.13 (#13420)
dependabot-preview[bot] [Wed, 8 Apr 2020 17:59:21 +0000 (02:59 +0900)]
Bump bcrypt from 3.1.12 to 3.1.13 (#13420)

Bumps [bcrypt](https://github.com/codahale/bcrypt-ruby) from 3.1.12 to 3.1.13.
- [Release notes](https://github.com/codahale/bcrypt-ruby/releases)
- [Changelog](https://github.com/codahale/bcrypt-ruby/blob/master/CHANGELOG)
- [Commits](https://github.com/codahale/bcrypt-ruby/compare/v3.1.12...v3.1.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoBump loofah from 2.4.0 to 2.5.0 (#13422)
dependabot-preview[bot] [Wed, 8 Apr 2020 17:58:12 +0000 (02:58 +0900)]
Bump loofah from 2.4.0 to 2.5.0 (#13422)

Bumps [loofah](https://github.com/flavorjones/loofah) from 2.4.0 to 2.5.0.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.4.0...v2.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
5 years agoFix styling of polls in JS-less fallback on public pages (#13436)
ThibG [Tue, 7 Apr 2020 16:21:58 +0000 (18:21 +0200)]
Fix styling of polls in JS-less fallback on public pages (#13436)

5 years agoMerge pull request #1312 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 6 Apr 2020 19:44:34 +0000 (21:44 +0200)]
Merge pull request #1312 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

5 years agoFix regression in `tootctl media remove-orphans` (#13405)
Eugen Rochko [Mon, 6 Apr 2020 12:11:47 +0000 (14:11 +0200)]
Fix regression in `tootctl media remove-orphans` (#13405)

Fix #13401

5 years agoFix trying to delete already deleted file when post-processing (#13406)
Eugen Rochko [Mon, 6 Apr 2020 12:11:22 +0000 (14:11 +0200)]
Fix trying to delete already deleted file when post-processing (#13406)

Fix #13403

5 years agoIncrease dependabot dependencies scope from security-only. (#13400)
Shlee [Mon, 6 Apr 2020 07:43:55 +0000 (15:43 +0800)]
Increase dependabot dependencies scope from security-only. (#13400)

* Update config.yml

* Update config.yml

* Update config.yml

* Update config.yml

5 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 5 Apr 2020 16:32:06 +0000 (18:32 +0200)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.js`:
  Upstream modified code that we split between multiple files due
  to glitch-soc's theming system.
  Ported those changes.