tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,717 Commits 10 Branches 0 Tags
5233e9910677c921ab93e0997964144b1df95a63
Commit Graph

13717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
5233e99106 Merge pull request #1531 from ClearlyClaire/glitch-soc/features/upstream-media-modal 
Port upstream's new media modal
 2021-05-08 00:37:51 +02:00
Claire
df82963ea4 Merge pull request #1532 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-05-08 00:21:55 +02:00
Claire
fbf097f7e1 Merge branch 'main' into glitch-soc/merge-upstream 2021-05-08 00:01:47 +02:00
Marcin Mikołajczak
196cef8977 [Glitch] Add transition to media modal background 
Port f8e50eaea3 to glitch-soc

Signed-off-by: marcin mikołajczak <me@mkljczk.pl>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Takeshi Umeda
34cc6f45ac [Glitch] Fix expand video on public page 
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
ThibG
d8e756eda8 [Glitch] Fix media modal buttons not showing up on mobile 
Port b08d2d4f78 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Eugen Rochko
d973a90bcc [Glitch] Fix not being able to open audio modal in web UI 
Port a8c471fcc0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Eugen Rochko
f29f8caccb [Glitch] Fix too low contrast on new media modal background in web UI 
Port 014733d1e4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Eugen Rochko
cccc65651d [Glitch] Fix media modal crashing when media has no blurhash 
Port 13206fcfb8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Eugen Rochko
9dde2400d0 [Glitch] Fix media modal regression on public pages 
Port e1a6526c8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
Eugen Rochko
50b100df00 Change media modals look in web UI 
Port 1e89e2ed98 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:47:09 +02:00
dependabot[bot]
81b19e28ff Bump hosted-git-info from 2.8.8 to 2.8.9 (#16177) 
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-05-07 22:04:09 +02:00
Eugen Rochko
d30dd5b1db [Glitch] Change home timeline to reload after follow recommendations in web UI 
Port 0ad240cb6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Eugen Rochko
5fa4138bd8 [Glitch] Fix "You might be interested in" flashing while searching in web UI 
Port 0a3fa034fc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Eugen Rochko
b571bc3278 [Glitch] Add empty state message for follow recommendations in web UI 
Port 8d75bd002d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Claire
56135a77f9 [Glitch] Hide floating action button on onboarding page 
Port 2c322addf3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Eugen Rochko
2f2c77c747 [Glitch] Change follow recommendations to be limited to 20 instead of 40 in web UI 
Port 7762d3d275 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Eugen Rochko
0936ae4132 [Glitch] Fix newlines not being considered sentence separators in account note 
Port b5ac17c4b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Eugen Rochko
89bc4dff6f [Glitch] Change onboarding by replacing tutorial with follow recommendations in web UI 
Port bf903dc510 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 22:00:11 +02:00
Claire
8615848348 Disable onboarding modal (keep it in “Show me around” from getting started menu) 2021-05-07 22:00:11 +02:00
Claire
2ad7bf08b4 Bump nodejs version requirement to node 12 (#16175) 
One of our dependencies, yarg, now requires node 12 or later
 2021-05-07 19:52:40 +02:00
Claire
50f8ee2e07 Merge pull request #1526 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-05-07 19:51:00 +02:00
Eugen Rochko
1294f9ee4f Remove PubSubHubbub-related columns from accounts table (#16170) 2021-05-07 19:32:58 +02:00
Eugen Rochko
e08b31a706 [Glitch] Add joined date to profiles in web UI 
Port 2c77d97e0d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 18:39:07 +02:00
fusagiko / takayamaki
dbb942999c [Glitch] fix component name 
Port c35a6b9e01 to glitch-soc

Co-authored-by: fusagiko / takayamaki <takayamaki@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-05-07 18:34:54 +02:00
Claire
50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream 
- `app/views/statuses/_simple_status.html.haml`:
  Small markup change in glitch-soc, on a line that has been modified by
  upstream. Ported upstream changes.
 2021-05-07 18:21:59 +02:00
Claire
d8e0c8a89e Do not populate AccountSummaries and FollowRecommendation views on migration (#16173) 
Materializing those views can take a while, and they are currently refreshed
anyway each time they are actually used, in the FollowRecommendationsScheduler.
 2021-05-07 18:14:29 +02:00
Claire
a5f91a11d0 Fix older migrations on Ruby 3 (#16174) 2021-05-07 15:56:45 +02:00
Eugen Rochko
0ad240cb6b Change home timeline to reload after follow recommendations in web UI (#16160) 2021-05-07 14:33:57 +02:00
Eugen Rochko
74081433d0 Change trending hashtags to be affected be reblogs (#16164) 
If a status with a hashtag becomes very popular, it stands to
reason that the hashtag should have a chance at trending

Fix no stats being recorded for hashtags that are not allowed
to trend, and stop ignoring bots

Remove references to hashtags in profile directory from the code
and the admin UI
 2021-05-07 14:33:43 +02:00
Eugen Rochko
2c77d97e0d Add joined date to profiles in web UI (#16169) 2021-05-07 14:33:19 +02:00
dependabot[bot]
b42a8ef7d9 Bump url-parse from 1.4.7 to 1.5.1 (#16172) 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.4.7 to 1.5.1.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.4.7...1.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-05-07 20:54:16 +09:00
dependabot[bot]
b44585aa89 Bump webpacker from 5.2.1 to 5.3.0 (#16144) 
Bumps [webpacker](https://github.com/rails/webpacker) from 5.2.1 to 5.3.0.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.2.1...v5.3.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-05-07 12:33:21 +09:00
dependabot[bot]
9e5bdd8007 Bump devise from 4.7.3 to 4.8.0 (#16140) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.3 to 4.8.0.
- [Release notes](https://github.com/plataformatec/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/plataformatec/devise/compare/v4.7.3...v4.8.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-05-07 12:27:58 +09:00
dependabot[bot]
09f051d0b7 Bump yargs from 16.2.0 to 17.0.0 (#16149) 
Bumps [yargs](https://github.com/yargs/yargs) from 16.2.0 to 17.0.0.
- [Release notes](https://github.com/yargs/yargs/releases)
- [Changelog](https://github.com/yargs/yargs/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/yargs/compare/v16.2.0...v17.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-05-07 12:27:33 +09:00
Claire
566fc90913 Add Ruby 3.0 support (#16046) 
* Fix issues with POSIX::Spawn, Terrapin and Ruby 3.0

Also improve the Terrapin monkey-patch for the stderr/stdout issue.

* Fix keyword argument handling throughout the codebase

* Monkey-patch Paperclip to fix keyword arguments handling in validators

* Change validation_extensions to please CodeClimate

* Bump microformats from 4.2.1 to 4.3.1

* Allow Ruby 3.0

* Add Ruby 3.0 test target to CircleCI

* Add test for admin dashboard warnings

* Fix admin dashboard warnings on Ruby 3.0
 2021-05-06 14:22:54 +02:00
Eugen Rochko
0a3fa034fc Fix "You might be interested in" flashing while searching in web UI (#16162) 2021-05-06 02:11:43 +02:00
Eugen Rochko
8d75bd002d Add empty state message for follow recommendations in web UI (#16161) 2021-05-05 23:57:29 +02:00
Eugen Rochko
6d9ad30bf8 Fix media redownload worker retrying on unexpected response codes (#16111) 2021-05-05 23:46:59 +02:00
Claire
aa1b43f467 Fix display of toots without text content (#15665) 
* Fix display of toots without text content

- fixes CWs from other implementations not showing up if toot has no text
  contents
- fixes the “Read more” thread indicator not showing up on threaded toots
  with no text contents

* Move content-less toot's CW to conents
 2021-05-05 23:41:02 +02:00
Takeshi Umeda
7cb34b32f8 Add management of delivery availability in Federation settings (#15771) 
* Add management of delivery availavility in Federation settings

* fix translate

* Remove useless object creation

* Fix DeepSource issue

* Add shortcut for all

* Fix DeepSource(skipcq)

* Change 'remove' to 'clear'

* Fix style

* Change class method name (exhausted_deliveries_key_by)
 2021-05-05 23:39:02 +02:00
Claire
d9ae3db8d5 Improve performance of follow recommendation scheduler (#16159) 
Express follow_recommendations in terms of account_summaries rather than
accounts, integrate filters that are unconditionally used, and materialize
the resulting view.

This should result in the bulk of the computation being performed only once
instead of **once per recommendation language**.
 2021-05-05 22:04:52 +02:00
Eugen Rochko
351c744590 Fix error when trying to render component for media without meta (#16112) 2021-05-05 21:16:55 +02:00
Eugen Rochko
059df83d1d Fix database serialization failure returning HTTP 500 (#16101) 
Database serialization failure occurs when a read-replica is used
and a query takes long enough that rows on the primary database
become unavailable. It should return HTTP 503 as it is temporary.

Re-order rescue definitions according to their status codes
 2021-05-05 19:44:35 +02:00
Eugen Rochko
036556d350 Fix media processing getting stuck on too much stdin/stderr (#16136) 
* Fix media processing getting stuck on too much stdin/stderr

See thoughtbot/terrapin#5

* Remove dependency on paperclip-av-transcoder gem

* Remove dependency on streamio-ffmpeg gem

* Disable stdin on ffmpeg process
 2021-05-05 19:44:01 +02:00
Claire
dfa002932d Workaround Resolv::DNS-induced hangs by installing resolv 0.1.0 (#16157) 
See https://github.com/tootsuite/mastodon/pull/16154#issuecomment-832062139
 2021-05-05 15:59:43 +02:00
Takeshi Umeda
25345c90ff Fix how to change connection pool for rails 6 (#16158) 
* Fix how to change connection pool for rails 6

* Fix to match the code elsewhere
 2021-05-05 04:41:10 +02:00
Mélanie Chauvel
19d3809ad5 Improve description of keyboard shortcuts (#16129) 
* Remove useless “to” from shortcuts description

* Improve descriptions of keyboard shortcuts

* Use curved quotations marks instead of straight ones
 2021-05-04 23:23:36 +02:00
Yamagishi Kazutoshi
dde0529fbc Remove dependency for @babel/plugin-proposal-class-properties (#16155) 2021-05-04 23:13:04 +02:00
Claire
d95128c99d Revert default Ruby version to 2.7.2 (#16154) 
Ruby 2.7.3 introduced a new bug with Resolv::DNS, which we heavily use within
Mastodon: https://bugs.ruby-lang.org/issues/17781

Ruby 2.7.3 also included security fixes for two CVEs, but those do not seem
to apply to Mastodon:
https://github.com/tootsuite/mastodon/pull/16004#issuecomment-815125025
 2021-05-04 23:06:19 +02:00