about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-11-25check_boxes label should use display: inline-block (#9348)takayamaki
2018-11-25Update MediaGallery and Video props when folding/unfolding CWs in detailed ↵Thibaut Girka
statuses
2018-11-25Render placeholder when inline video container width isn't knownThibaut Girka
2018-11-25Render placeholder instead of image when MediaGallery container width isn't ↵Thibaut Girka
known
2018-11-24Sort self-replies to the top of descendants (#9320)Eugen Rochko
Fix #6463
2018-11-23Revert "Sort self-replies to the top of the thread (#9296)" (#9335)Eugen Rochko
This reverts commit 074960bb0fa59664c0ae1a35ef80301f5033700d. Fix #9315
2018-11-23Bump simple_form from 4.0.1 to 4.1.0 (#9331)dependabot[bot]
Bumps [simple_form](https://github.com/plataformatec/simple_form) from 4.0.1 to 4.1.0. - [Release notes](https://github.com/plataformatec/simple_form/releases) - [Changelog](https://github.com/plataformatec/simple_form/blob/master/CHANGELOG.md) - [Commits](https://github.com/plataformatec/simple_form/compare/v4.0.1...v4.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-22Fix connect timeout not being enforced (#9329)Eugen Rochko
* 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-22Ignore JSON-LD profile in mime type comparison (#9179)valerauko
Ignore JSON-LD profile in mime type comparison
2018-11-22Bump sidekiq-bulk from 0.1.1 to 0.2.0 (#9306)dependabot[bot]
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-22Bump aws-sdk-s3 from 1.24.0 to 1.25.0 (#9321)dependabot[bot]
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-22Bump capybara from 3.11.0 to 3.11.1 (#9305)dependabot[bot]
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-21Include replies to list owner and replies to list members in list statuses ↵ThibG
(#9324)
2018-11-21Revert connect timeout from 1s to 10s (#9319)Eugen Rochko
The failure rate in Sidekiq is too high
2018-11-20Touch account on successful response, change char shown when culled (#9293)Renato "Lond" Cerqueira
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-20WebSub: ATOM before RSS (#9302)Alexandre Alapetite
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-20Update Nginx config for Nanobox apps (#9310)Dan Hunsaker
The Nanobox files have gotten out of sync, a touch, with what Masto needs for Nginx settings. This PR updates them accordingly.
2018-11-20Cast status_count to integer (#9314)Eugen Rochko
It is returned as a double because the sum is now over bigint columns Fix #9312
2018-11-19Move URLs to backend in their own fileThibaut Girka
2018-11-19Simplify hashtag query service, perf increase for 'any' tags (#9298)James Kiesel
2018-11-19Fix filter ID not being a string in REST API (#9303)Eugen Rochko
2018-11-19Extract counters from accounts table to account_stats table (#9295)Eugen Rochko
2018-11-17Deep compare tags for hashtag column reload (#9297)James Kiesel
* Deep compare tags for hashtag column reload * Don't use global lodash
2018-11-16Prevent multiple handlers for Delete of Actor from running (#9292)Eugen Rochko
2018-11-16Sort self-replies to the top of the thread (#9296)Eugen Rochko
Fix #6463
2018-11-16Fix composer not displaying on iPadThibaut Girka
2018-11-16Remove intermediary arrays when creating hash maps from results (#9291)Eugen Rochko
2018-11-16Bump aws-sdk-s3 from 1.23.1 to 1.24.0 (#9289)dependabot[bot]
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-16Change the password form order (#9267)mayaeh
* Change order of password. * Update Japanese translation for "Show thread". * Separate the translation PR.
2018-11-16Fix "tootctl media remove" can't count the file size (#9288)mayaeh
* Fixed an issue where "tootctl media remove" can not count the file size. * Fixed the problem pointed out by codeclimate.
2018-11-16Update Japanese translation for "Show thread". (#9287)mayaeh
2018-11-15In detailed status view, take displayMedia setting into account when ↵Thibaut Girka
changing media Fixes #819
2018-11-15Bump capybara from 3.10.1 to 3.11.0 (#9285)dependabot[bot]
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-13Only stream local-only toots to logged-in usersThibaut Girka
2018-11-13Add field to serialized local-only statusesThibaut Girka
2018-11-13Exclude local-only toots from atom feedsThibaut Girka
2018-11-13Merge pull request #817 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-13[Glitch] Fix race condition when interacting with deleted tootsThibaut Girka
Port c875f19673e923e7a6e3c2b6656e96b863ca5915 to glitch-soc
2018-11-13Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-13[Glitch] Prepend account header even when status list is emptyThibaut Girka
Partially port 90b64c006998ec3bae365007781c61e8a79eeeef
2018-11-13[Glitch] Fix loading indicator inconsistencyThibaut Girka
Port 3cecf3e5b995f5035b17fd9572c17ba1ede9346b to glitch-soc
2018-11-13[Glitch] Use local instead of global loading indicator for timelines, ↵Thibaut Girka
account timelines Port dd00cd19d2536ce70442d74d72986721427691a5 to glitch-soc
2018-11-13Fix race condition causing shallow status with only a "favourited" attribute ↵ThibG
(#9272) Fixes #9231
2018-11-12Fix null error introduced in #9270 (#9275)Eugen Rochko
2018-11-12Perform deep comparison for card data when receiving new props (#9270)ThibG
Fixes #9226
2018-11-12Merge pull request #813 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-12Tighten CSP a bitThibaut Girka
2018-11-12Bump parallel_tests from 2.26.2 to 2.27.0 (#9263)dependabot[bot]
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-12Bump thor from 0.20.0 to 0.20.3 (#9266)dependabot[bot]
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-12Bump oj from 3.7.0 to 3.7.1 (#9265)dependabot[bot]
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>