fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
9815 commits 135 branches 266 tags 983 MiB
Commit graph

9815 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ThibG 99c1f0811b Fix BlockService trying to reject incorrect follow request (#11288) 
Fixes #11148
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 9521cacd40 [Security] Bump lodash from 4.17.11 to 4.17.13 (#11287) 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.**
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
ThibG 9f67e3b9cc Fix Status.remote scope matching *all* statuses (#11265) 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] c40d47b8e0 Bump faker from 1.9.3 to 1.9.6 (#11259) 
Bumps [faker](https://github.com/stympy/faker) from 1.9.3 to 1.9.6.
- [Release notes](https://github.com/stympy/faker/releases)
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stympy/faker/compare/v1.9.3...1.9.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 2f441876c7 Bump simplecov from 0.16.1 to 0.17.0 (#11260) 
Bumps [simplecov](https://github.com/colszowka/simplecov) from 0.16.1 to 0.17.0.
- [Release notes](https://github.com/colszowka/simplecov/releases)
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md)
- [Commits](https://github.com/colszowka/simplecov/compare/v0.16.1...v0.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 23978df143 Bump aws-sdk-s3 from 1.43.0 to 1.45.0 (#11262) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.43.0 to 1.45.0.
- [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/compare/v1.43.0...v1.45.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 4ea8f2189c Bump tzinfo-data from 1.2019.1 to 1.2019.2 (#11258) 
Bumps [tzinfo-data](https://github.com/tzinfo/tzinfo-data) from 1.2019.1 to 1.2019.2.
- [Release notes](https://github.com/tzinfo/tzinfo-data/releases)
- [Commits](https://github.com/tzinfo/tzinfo-data/compare/v1.2019.1...v1.2019.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 16340cb6ef Bump eslint-plugin-react from 7.12.1 to 7.14.2 (#11253) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.12.1 to 7.14.2.
- [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.12.1...v7.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 9699506dc4 Bump @babel/plugin-proposal-class-properties from 7.4.4 to 7.5.0 (#11254) 
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.4.4 to 7.5.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.4.4...v7.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] ed43922483 Bump compression-webpack-plugin from 2.0.0 to 3.0.0 (#11224) 
Bumps [compression-webpack-plugin](https://github.com/webpack-contrib/compression-webpack-plugin) from 2.0.0 to 3.0.0.
- [Release notes](https://github.com/webpack-contrib/compression-webpack-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/compression-webpack-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/compression-webpack-plugin/compare/v2.0.0...v3.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] 2fa85ead32 Bump intl-relativeformat from 2.2.0 to 6.4.2 (#11255) 
Bumps [intl-relativeformat](https://github.com/formatjs/formatjs) from 2.2.0 to 6.4.2.
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/intl-relativeformat@2.2.0...intl-relativeformat@6.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
dependabot-preview[bot] ea0c09e4fb Bump react-redux from 6.0.1 to 7.1.0 (#11256) 
Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.1 to 7.1.0.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.1...v7.1.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-07-15 00:48:50 +02:00
ThibG bd77fd6ff3 Fix BackupService crashing when an attachment is missing (#11241) 
* Fix BackupService crashing when an attachment is missing

For various reasons such as admin error or out-of-sync media and
database backups, it might be possible for local attachments to be lost.

This commit allows the BackupService to continue its work even if some media
file is missing.

* Change error message
 2019-07-15 00:48:49 +02:00
Georg Gadinger b073008282 Update fuubar dependency to 2.4.1 (#11248) 
See also: thekompanee/fuubar#111
 2019-07-15 00:48:49 +02:00
Thibaut Girka 1b074d2a50 Add link to edit each listed filter 2019-07-15 00:48:28 +02:00
Thibaut Girka f7fa11c4cd Make some strings translatable 2019-07-15 00:48:28 +02:00
Thibaut Girka fc8577cf2b Minor refactoring 2019-07-15 00:48:28 +02:00
Thibaut Girka 707b8d7d75 Move the “Show why” button inline 2019-07-15 00:48:28 +02:00
Thibaut Girka 85f3bc1ab3 Implement feature to add filtered phrases to content warnings 2019-07-15 00:48:28 +02:00
Thibaut Girka 42b59b730b Implement option to completely hide filtered toots 2019-07-15 00:48:28 +02:00
Thibaut Girka 16b79a6237 Add options to configure filtering behavior 2019-07-15 00:48:28 +02:00
Thibaut Girka bde7a415b9 Add a way to know why a status has been filtered, and show it anyway 2019-07-15 00:48:28 +02:00
Thibaut Girka e9fac2def9 Do not keep polls pre-filled in thread mode 2019-07-15 00:41:09 +02:00
Thibaut Girka e0bfa685c6 Fix error boundary CSS 2019-07-15 00:28:31 +02:00
Thibaut Girka 0baaee495f Fix report dialog crashing when a toot gets deleted 
Fixes #1155
 2019-07-10 19:53:31 +02:00
ThibG fce885f271
Merge pull request #1152 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-07-07 22:26:10 +02:00
Thibaut Girka 5ff9970c8d Re-add route for direct timeline 2019-07-07 14:12:41 +02:00
ThibG 64f3bc77ac [Glitch] Only scroll to the compose form if it's not horizontally in the viewport 
Port c07cca4727 to glitch-soc
 2019-07-07 14:03:12 +02:00
ThibG a0b614f10a Fix support for HTTP proxies (#11245) 
* Disable incorrect check for hidden services in Socket

Hidden services can only be accessed with an HTTP proxy, in which
case the host seen by the Socket class will be the proxy, not the
target host.

Hidden services are already filtered in `Request#initialize`.

* Use our Socket class to connect to HTTP proxies

Avoid the timeout logic being bypassed

* Add support for IP addresses in Request::Socket

* Refactor a bit, no need to keep the DNS resolver around
 2019-07-07 13:53:09 +02:00
Thibaut Girka 7039dca12c Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream 
Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
 2019-07-07 13:49:31 +02:00
ThibG c07cca4727 Only scroll to the compose form if it's not horizontally in the viewport (#11246) 
Avoids jumping the scroll around vertically when giving it focus and
editing long toots.
 2019-07-06 18:18:08 +02:00
Eugen Rochko ae003d54f9
Fix option to send e-mail notification about account action always being true (#11242) 2019-07-06 13:54:32 +02:00
ThibG ed544f3166 Fix HTTP requests to IPv6 hosts (#11240) 2019-07-05 22:03:00 +02:00
Thibaut Girka e5f4d83e60 Allow serializing local-only toots in backup service 
Fixes #1153
 2019-07-05 21:50:19 +02:00
Eugen Rochko 0c1b1069c9
Remove deprecated REST API GET /api/v1/statuses/:id/card (#11213) 2019-07-05 02:15:24 +02:00
Eugen Rochko 30f5bcf3e7
Remove deprecated REST API POST /api/v1/notifications/dismiss?id=:id (#11214) 2019-07-05 02:15:13 +02:00
Eugen Rochko 3fd6ab99e6
Remove deprecated REST API GET /api/v1/timelines/direct (#11212) 2019-07-05 02:14:56 +02:00
ThibG 47c30be8d8 [Glitch] Memoize ancestorIds and descendantIds in detailed status view 
Port 99924f282f to glitch-soc
 2019-07-04 16:26:17 +02:00
ThibG 894d82a325 [Glitch] When deleting & redrafting a poll, fill in closest expires_in 
Port dc88d226e1 to glitch-soc
 2019-07-04 16:24:48 +02:00
Thibaut Girka 6ab84c12a7 Merge branch 'master' into glitch-soc/merge-upstream 2019-07-04 16:21:39 +02:00
ThibG 99924f282f Memoize ancestorIds and descendantIds in detailed status view (#11234) 2019-07-02 16:03:54 +02:00
Eugen Rochko 3bc0c4a884
Remove unused StatsD code and expose StatsD as a global variable (#11232) 
The instrumentation code was used for StatsD metrics collection
prior to the switch to the nsa gem and should have been removed
at that point as it no longer does anything at all
 2019-07-02 11:34:39 +02:00
Eugen Rochko 1a747f7020
Fix statsd UDP sockets not being cleaned up in Sidekiq (#11230) 2019-07-02 01:01:17 +02:00
Eugen Rochko bc60d794f8
Change ActivityPub::DeliveryWorker to not retry HTTP 501 errors (#11233) 2019-07-02 00:59:53 +02:00
ThibG dc88d226e1 When deleting & redrafting a poll, fill in closest expires_in (#11203) 
Use the smallest preset expires_in such that the new poll would
not expire before the old one.

In the typical case of a quick delete & redraft, this results in
using the same poll duration.

Fixes #10567
 2019-07-02 00:36:16 +02:00
Eugen Rochko 0d9ffe56fb
Add request pool to improve delivery performance (#10353) 
* Add request pool to improve delivery performance

Fix #7909

* Ensure connection is closed when exception interrupts execution

* Remove Timeout#timeout from socket connection

* Fix infinite retrial loop on HTTP::ConnectionError

* Close sockets on failure, reduce idle time to 90 seconds

* Add MAX_REQUEST_POOL_SIZE option to limit concurrent connections to the same server

* Use a shared pool size, 512 by default, to stay below open file limit

* Add some tests

* Add more tests

* Reduce MAX_IDLE_TIME from 90 to 30 seconds, reap every 30 seconds

* Use a shared pool that returns preferred connection but re-purposes other ones when needed

* Fix wrong connection being returned on subsequent calls within the same thread

* Reduce mutex calls on flushes from 2 to 1 and add test for reaping
 2019-07-02 00:34:38 +02:00
Thibaut Girka c94966891a Minor cleanup and maybe minor performance improvements 2019-07-01 19:31:21 +02:00
Thibaut Girka 9d6b46fe34 Minor optimization regarding regexp filtering in timelines 2019-07-01 19:31:21 +02:00
Thibaut Girka c49f7d5d16 Use strict equality rather than Immutable.is as the compared props are values 2019-07-01 19:31:10 +02:00
Thibaut Girka 82a76f03a4 Assume children of visible IntersectionObserverArticle always change 
This fixes multiple issues, while adding few computations
 2019-07-01 19:31:10 +02:00