djsundog
/
tootlab-mastodon
mirror of https://github.com/glitch-soc/mastodon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,236 Commits 69 Branches 20 Tags 353 MiB
Commit Graph

8236 Commits

Author SHA1 Message Date
Eugen Rochko fd8145d232
Fix connect timeout not being enforced (#9329) 
* Fix connect timeout not being enforced

The loop was catching the timeout exception that should stop execution, so the next IP would no longer be within a timed block, which led to requests taking much longer than 10 seconds.

* Use timeout on each IP attempt, but limit to 2 attempts

* Fix code style issue

* Do not break Request#perform if no block given

* Update method stub in spec for Request

* Move timeout inside the begin/rescue block

* Use Resolv::DNS with timeout of 1 to get IP addresses

* Update Request spec to stub Resolv::DNS instead of Addrinfo

* Fix Resolve::DNS stubs in Request spec
 2018-11-22 20:12:04 +01:00
valerauko 824497fbce Ignore JSON-LD profile in mime type comparison (#9179) 
Ignore JSON-LD profile in mime type comparison
 2018-11-22 12:49:07 +01:00
dependabot[bot] 473998ca27 Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306) 
Bumps [sidekiq-bulk](https://github.com/aprescott/sidekiq-bulk) from 0.1.1 to 0.2.0.
- [Release notes](https://github.com/aprescott/sidekiq-bulk/releases)
- [Changelog](https://github.com/aprescott/sidekiq-bulk/blob/master/CHANGES.md)
- [Commits](https://github.com/aprescott/sidekiq-bulk/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 12:47:36 +01:00
dependabot[bot] c100e82a56 Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.24.0 to 1.25.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/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 12:47:14 +01:00
dependabot[bot] 7278e32745 Bump capybara from 3.11.0 to 3.11.1 (#9305) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.11.0...3.11.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-22 12:46:57 +01:00
ThibG 466e3d710c Include replies to list owner and replies to list members in list statuses (#9324) 2018-11-21 17:02:58 +01:00
Eugen Rochko 384e953b75
Revert connect timeout from 1s to 10s (#9319) 
The failure rate in Sidekiq is too high
 2018-11-21 17:00:56 +01:00
Renato "Lond" Cerqueira c66739b418 Touch account on successful response, change char shown when culled (#9293) 
Just the color is not enough change since not everyone uses colored
terminals.
Touching the account makes it so that the account is not in the
threshold window in case of running again
 2018-11-20 22:25:32 +01:00
Alexandre Alapetite d1d2377870 WebSub: ATOM before RSS (#9302) 
Hello,
The ATOM feed contains the hub declaration for WebSub, but the RSS
version does not.
RSS/ATOM readers will typically pick whichever version comes first, and
will thus not see the WebSub feature.
I therefore suggest putting the ATOM version first, as it is more
feature-rich than its RSS counterpart is.

Clients not compatible with ATOM would not pick it anyway due to the
different type attribute.

A more complicated alternative would be to declare the WebSub feature in
the RSS version as well, using something like the following code, and
ensuring that clients subscribed to the RSS version would receive PuSH
updates just like those subscribed to the ATOM version.

````xml
<rss version="2.0" xmlns:webfeeds="http://webfeeds.org/rss/1.0"
xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<atom:link rel="self" type="application/rss+xml"
href="https://diaspodon.fr/users/test.rss"/>
<atom:link rel="hub" href="https://diaspodon.fr/api/push"/>
</channel>
</rss>
```
 2018-11-20 22:25:04 +01:00
Dan Hunsaker 1f7311b14b Update Nginx config for Nanobox apps (#9310) 
The Nanobox files have gotten out of sync, a touch, with what Masto needs for Nginx settings. This PR updates them accordingly.
 2018-11-20 22:24:35 +01:00
Eugen Rochko 0c666ae5e6
Cast status_count to integer (#9314) 
It is returned as a double because the sum is now over bigint columns

Fix #9312
 2018-11-20 02:52:52 +01:00
Thibaut Girka b3ff35a75c Move URLs to backend in their own file 2018-11-19 15:56:38 +01:00
James Kiesel 6a65d87f4d Simplify hashtag query service, perf increase for 'any' tags (#9298) 2018-11-19 12:49:50 +01:00
Eugen Rochko 1d38c9750a
Fix filter ID not being a string in REST API (#9303) 2018-11-19 10:37:57 +01:00
Eugen Rochko d6b9a62e0a
Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
James Kiesel 4fdefffb99 Deep compare tags for hashtag column reload (#9297) 
* Deep compare tags for hashtag column reload

* Don't use global lodash
 2018-11-17 11:07:48 +01:00
Eugen Rochko 9311430ed7
Prevent multiple handlers for Delete of Actor from running (#9292) 2018-11-16 19:46:23 +01:00
Eugen Rochko 074960bb0f
Sort self-replies to the top of the thread (#9296) 
Fix #6463
 2018-11-16 19:34:10 +01:00
Thibaut Girka a77ee0bb6d Fix composer not displaying on iPad 2018-11-16 15:04:32 +01:00
Eugen Rochko 8069fd636b
Remove intermediary arrays when creating hash maps from results (#9291) 2018-11-16 15:02:18 +01:00
dependabot[bot] 367ad21995 Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.23.1 to 1.24.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/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-16 11:19:09 +01:00
mayaeh bdd3c8c255 Change the password form order (#9267) 
* Change order of password.

* Update Japanese translation for "Show thread".

* Separate the translation PR.
 2018-11-16 11:18:43 +01:00
mayaeh 8f7e3d3772 Fix "tootctl media remove" can't count the file size (#9288) 
* Fixed an issue where "tootctl media remove" can not count the file size.

* Fixed the problem pointed out by codeclimate.
 2018-11-16 09:47:40 +01:00
mayaeh 560acf171e Update Japanese translation for "Show thread". (#9287) 2018-11-16 11:16:10 +09:00
Thibaut Girka 86527024aa In detailed status view, take displayMedia setting into account when changing media 
Fixes #819
 2018-11-15 16:38:50 +01:00
dependabot[bot] 96165a29ba Bump capybara from 3.10.1 to 3.11.0 (#9285) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.10.1 to 3.11.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.10.1...3.11.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-15 14:49:06 +09:00
Thibaut Girka a100f05687 Only stream local-only toots to logged-in users 2018-11-13 18:55:57 +01:00
Thibaut Girka f84897c7d7 Add field to serialized local-only statuses 2018-11-13 18:55:57 +01:00
Thibaut Girka 759750801e Exclude local-only toots from atom feeds 2018-11-13 18:55:57 +01:00
ThibG e4feef6b5c
Merge pull request #817 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-13 18:48:07 +01:00
Thibaut Girka 6ce7e74b46 [Glitch] Fix race condition when interacting with deleted toots 
Port c875f19673 to glitch-soc
 2018-11-13 16:30:07 +01:00
Thibaut Girka bfe2b9cc50 Merge branch 'master' into glitch-soc/merge-upstream 2018-11-13 16:28:07 +01:00
Thibaut Girka 2fe0cb1623 [Glitch] Prepend account header even when status list is empty 
Partially port 90b64c0069
 2018-11-13 15:54:04 +01:00
Thibaut Girka c78c80f807 [Glitch] Fix loading indicator inconsistency 
Port 3cecf3e5b9 to glitch-soc
 2018-11-13 15:54:04 +01:00
Thibaut Girka 5ebbaffaa3 [Glitch] Use local instead of global loading indicator for timelines, account timelines 
Port dd00cd19d2 to glitch-soc
 2018-11-13 15:54:04 +01:00
ThibG c875f19673 Fix race condition causing shallow status with only a "favourited" attribute (#9272) 
Fixes #9231
 2018-11-13 14:58:14 +01:00
Eugen Rochko bb69d154c4
Fix null error introduced in #9270 (#9275) 2018-11-12 22:07:31 +01:00
ThibG bbd8fdd185 Perform deep comparison for card data when receiving new props (#9270) 
Fixes #9226
 2018-11-12 18:17:50 +01:00
ThibG c5a4dc9118
Merge pull request #813 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-11-12 16:00:16 +01:00
Thibaut Girka 1283e112b9 Tighten CSP a bit 2018-11-12 15:43:02 +01:00
dependabot[bot] c81bdafb07 Bump parallel_tests from 2.26.2 to 2.27.0 (#9263) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.26.2 to 2.27.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.26.2...v2.27.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:50:48 +01:00
dependabot[bot] 971863c426 Bump thor from 0.20.0 to 0.20.3 (#9266) 
Bumps [thor](https://github.com/wycats/thor) from 0.20.0 to 0.20.3.
- [Release notes](https://github.com/wycats/thor/releases)
- [Changelog](https://github.com/erikhuda/thor/blob/master/CHANGELOG.md)
- [Commits](https://github.com/wycats/thor/compare/v0.20.0...v0.20.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:50:21 +01:00
dependabot[bot] 111ad86680 Bump oj from 3.7.0 to 3.7.1 (#9265) 
Bumps [oj](https://github.com/ohler55/oj) from 3.7.0 to 3.7.1.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.7.0...v3.7.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:50:12 +01:00
dependabot[bot] fe57d73e4c Bump bullet from 5.8.1 to 5.9.0 (#9264) 
Bumps [bullet](https://github.com/flyerhzm/bullet) from 5.8.1 to 5.9.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/5.8.1...5.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-11-12 12:49:51 +01:00
Les Orchard cc1f13dfd0 Only consider mouse move in scrolling on item insertion (#9262) 
Fixes #9259
 2018-11-11 23:20:20 +01:00
mayaeh 208d278cbc i18n: Add ja translations (#9261) 
* Run yarn manage:translations

* Add Japanese translations.
 2018-11-11 18:57:16 +01:00
ThibG 7f5a4be580 Fix emoji update date processing (#9255) 2018-11-10 23:59:51 +01:00
ThibG 9b89c62d43 Check that twitter:player is valid before using it (#9254) 
Fixes #9251
 2018-11-10 20:42:04 +01:00
Thibaut Girka 0506c6f62f Merge branch 'master' into glitch-soc/merge-upstream 2018-11-10 17:57:19 +01:00
Eugen Rochko 3cecf3e5b9
Fix loading indicator inconsistency (#9252) 
* Use global loading indicator when loading more items

* Use local loading indicator for notifications

And remove global loading indicator for initial custom emojis load
 2018-11-10 15:04:13 +01:00