fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 07:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
12573 commits 133 branches 266 tags 980 MiB
Commit graph

12573 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka 3fefb7909b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/shared.js`:
  Upstream has changed how Tesseract.js gets included and dropped a dependency.
  The conflict is caused by glitch-soc having different code due to its
  theming system.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream refactor/code style change in a place we replaced upstream's
  repo URL with ours.
  Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
  Upstream dropped dependencies, one of which was textually too close to
  a glitch-soc-specific dependency. Not a real conflict.
 2020-09-01 17:02:18 +02:00
Thibaut Girka d95dd3883e Change radio button design to be consistent with that of the directory explorer 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-01 14:09:35 +02:00
Thibaut Girka 70e64206be Capitalize replies_policy strings 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-09-01 14:09:35 +02:00
ThibG 79305428a7
Add configuration option to filter replies in lists (#9205) 
* Add database support for list show-reply preferences

* Add backend support to read and update list-specific show_replies settings

* Add basic UI to set list replies setting

* Add specs for list replies policy

* Switch "cycling" reply policy link to a set of radio inputs

* Capitalize replies_policy strings

* Change radio button design to be consistent with that of the directory explorer
 2020-09-01 13:31:28 +02:00
Eugen Rochko 1c308af84c
Change own direct-visibility statuses to be in the home feed again (#14711) 
And remove highlighting in web UI

Full circle from #8940
 2020-09-01 13:30:42 +02:00
Thibaut Girka e02f375d22 Fix threaded mode 
Fixes #1414
 2020-09-01 09:37:17 +02:00
dependabot[bot] 6d98b039a5
Bump uri-js from 4.2.2 to 4.4.0 (#14706) 
Bumps [uri-js](https://github.com/garycourt/uri-js) from 4.2.2 to 4.4.0.
- [Release notes](https://github.com/garycourt/uri-js/releases)
- [Commits](https://github.com/garycourt/uri-js/compare/4.2.2...4.4.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:35:56 +09:00
dependabot[bot] 350c698329
Bump mini-css-extract-plugin from 0.9.0 to 0.11.0 (#14690) 
Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.9.0 to 0.11.0.
- [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases)
- [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/mini-css-extract-plugin/compare/v0.9.0...v0.11.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:35:27 +09:00
Eugen Rochko 71085987e8
Add --fix-permissions option to tootctl media remove-orphans (#14383) 2020-09-01 03:33:21 +02:00
dependabot[bot] 26227c8e60
Bump whatwg-url from 8.1.0 to 8.2.1 (#14688) 
Bumps [whatwg-url](https://github.com/jsdom/whatwg-url) from 8.1.0 to 8.2.1.
- [Release notes](https://github.com/jsdom/whatwg-url/releases)
- [Commits](https://github.com/jsdom/whatwg-url/compare/v8.1.0...v8.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:33:15 +09:00
dependabot[bot] 902c6b3218
Bump loglevel from 1.6.8 to 1.7.0 (#14692) 
Bumps [loglevel](https://github.com/pimterry/loglevel) from 1.6.8 to 1.7.0.
- [Release notes](https://github.com/pimterry/loglevel/releases)
- [Commits](https://github.com/pimterry/loglevel/compare/v1.6.8...v1.7.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:27:49 +09:00
dependabot[bot] 84db8247ce
Bump caniuse-lite from 1.0.30001117 to 1.0.30001120 (#14695) 
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001117 to 1.0.30001120.
- [Release notes](https://github.com/ben-eb/caniuse-lite/releases)
- [Changelog](https://github.com/ben-eb/caniuse-lite/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ben-eb/caniuse-lite/compare/v1.0.30001117...v1.0.30001120)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:27:20 +09:00
dependabot[bot] 4f8712272d
Bump querystringify from 2.1.1 to 2.2.0 (#14696) 
Bumps [querystringify](https://github.com/unshiftio/querystringify) from 2.1.1 to 2.2.0.
- [Release notes](https://github.com/unshiftio/querystringify/releases)
- [Commits](https://github.com/unshiftio/querystringify/compare/2.1.1...2.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:26:55 +09:00
dependabot[bot] 535d97eff3
Bump opener from 1.5.1 to 1.5.2 (#14698) 
Bumps [opener](https://github.com/domenic/opener) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/domenic/opener/releases)
- [Commits](https://github.com/domenic/opener/compare/v1.5.1...v1.5.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:24:57 +09:00
dependabot[bot] 4aead83bed
Bump side-channel from 1.0.2 to 1.0.3 (#14700) 
Bumps [side-channel](https://github.com/ljharb/side-channel) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/ljharb/side-channel/releases)
- [Changelog](https://github.com/ljharb/side-channel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/side-channel/compare/v1.0.2...v1.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:24:37 +09:00
dependabot[bot] e83040161f
Bump @testing-library/jest-dom from 5.11.2 to 5.11.4 (#14703) 
Bumps [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) from 5.11.2 to 5.11.4.
- [Release notes](https://github.com/testing-library/jest-dom/releases)
- [Changelog](https://github.com/testing-library/jest-dom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/testing-library/jest-dom/compare/v5.11.2...v5.11.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:22:02 +09:00
dependabot[bot] ad9e69b3b2
Bump postcss-calc from 7.0.2 to 7.0.3 (#14705) 
Bumps [postcss-calc](https://github.com/postcss/postcss-calc) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/postcss/postcss-calc/releases)
- [Changelog](https://github.com/postcss/postcss-calc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/postcss-calc/compare/7.0.2...v7.0.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 10:21:16 +09:00
dependabot[bot] 8972e5f7f6
Bump rubocop from 0.86.0 to 0.88.0 (#14412) 
* Bump rubocop from 0.86.0 to 0.88.0

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.86.0 to 0.88.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.86.0...v0.88.0)

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

* Fix for latest RuboCop

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2020-09-01 03:04:00 +02:00
dependabot[bot] 10f180417e
Bump aws-partitions from 1.362.0 to 1.363.0 (#14713) 
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.362.0 to 1.363.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-partitions/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:58:51 +02:00
dependabot[bot] 5c87891ea3
Bump hamlit from 2.11.0 to 2.11.1 (#14689) 
Bumps [hamlit](https://github.com/k0kubun/hamlit) from 2.11.0 to 2.11.1.
- [Release notes](https://github.com/k0kubun/hamlit/releases)
- [Changelog](https://github.com/k0kubun/hamlit/blob/master/CHANGELOG.md)
- [Commits](https://github.com/k0kubun/hamlit/compare/v2.11.0...v2.11.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:57:12 +02:00
dependabot[bot] e3b4d3179a
Bump aws-sdk-s3 from 1.78.0 to 1.79.1 (#14691) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.78.0 to 1.79.1.
- [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@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:56:53 +02:00
dependabot[bot] 581c27510e
Bump aws-sdk-core from 3.104.4 to 3.105.0 (#14694) 
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.104.4 to 3.105.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-core/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:56:32 +02:00
dependabot[bot] 476f7e8248
Bump microformats from 4.2.0 to 4.2.1 (#14699) 
Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/microformats/microformats-ruby/releases)
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.2.0...v4.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:56:08 +02:00
dependabot[bot] 0f568f8431
Bump loofah from 2.6.0 to 2.7.0 (#14701) 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.6.0 to 2.7.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.6.0...v2.7.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:55:48 +02:00
dependabot[bot] 65d78d4f94
Bump parallel_tests from 3.1.0 to 3.2.0 (#14702) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Changelog](https://github.com/grosser/parallel_tests/blob/master/CHANGELOG.md)
- [Commits](https://github.com/grosser/parallel_tests/compare/v3.1.0...v3.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:55:16 +02:00
dependabot[bot] af2396433a
Bump oj from 3.10.12 to 3.10.13 (#14704) 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.12 to 3.10.13.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.12...v3.10.13)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-01 02:54:34 +02:00
ThibG 5fc5a9f9f1
Update Tesseract.js (#14708) 
* [WiP] Update Tesseract.js

- Update Tesseract.js to 2.2.1
- Use versioned file names
- differentiate two progression states: preparing OCR and detecting picture

* Get rid of copy-webpack-plugin
 2020-09-01 00:26:10 +02:00
Thibaut Girka 38182fceb3 Fix crash when opening detailed view of a status you boosted 2020-08-31 23:48:16 +02:00
ThibG f0b6ddd979
Add border around 🐞 emoji (#14712) 2020-08-31 23:30:27 +02:00
ThibG 7febf19296
Add back “Home” link to the “Getting Started” column when the “Home” column isn't mounted (#14707) 
* Add back "Home" link to "Getting started" when Home column isn't mounted

* Fix keys in getting_started

It should not matter much in practice as the list of items will only
change extremely rarely, but having a `key` that corresponds to the actual
item makes much more sense than having it be the index of the item within
the list.
 2020-08-31 18:11:37 +02:00
Takeshi Umeda b1bb1906be
Fix limited follower id in fan-out-on-write service (#14709) 2020-08-31 18:11:27 +02:00
Akihiko Odaki ae871c4d46
Make Array-creation behavior of Paginable more predictable (#14687) 
* Make Array-creation behavior of Paginable more predictable

Paginable.paginate_by_id usually returns ActiveRecord::Relation, but it
returns an Array if min_id option is present. The behavior caused problems
fixed with the following commits:
- 552e886b64
- b63ede5005
- 64ef37b89d

To prevent from recurring similar problems, this commit introduces two
changes:
- The scope now always returns an Array whether min_id option is present
  or not.
- The scope is renamed to to_a_paginated_by_id to clarify it returns an
  Array.

* Transform Paginable.to_a_paginated_by_id from a scope to a class method

https://api.rubyonrails.org/classes/ActiveRecord/Scoping/Named/ClassMethods.html#method-i-scope
> The method is intended to return an ActiveRecord::Relation object, which
> is composable with other scopes.

Paginable.to_a_paginated_by_id returns an Array and is not appropriate
as a scope.
 2020-08-31 12:47:09 +02:00
ThibG f715e8b516
Merge pull request #1411 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-08-30 18:34:51 +02:00
Thibaut Girka a68ec50e4e Adapt 2FA changes to glitch-soc's theming system 2020-08-30 17:26:18 +02:00
santiagorodriguez96 a340e653df [Glitch] Add WebAuthn as an alternative 2FA method 
Port CSS changes from e8d41bc2fe

Co-authored-by: Facundo Padula <facundo.padula@cedarcode.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 17:21:16 +02:00
Tdxdxoz bf55b5463a [Glitch] Fix: also use custom private boost icon for detailed status 
Port a3ec9af9b0 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:51:16 +02:00
Kairui Song | 宋恺睿 03b5f09ffc
Minor fix & improvement for the Dockerfile (#14686) 
* Dockerfile: Fix building with multiarch

Tested on amd64 and arm64

* Reduce docker image size by clean up some unneeded source file
 2020-08-30 16:45:49 +02:00
Daigo 3 Dango 72b1d5fdc5 [Glitch] Better manage subscriptionCounters 
Port 9669557be1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:35:33 +02:00
proxy 3bbf6b1519 [Glitch] reword "boost to original audience" as per tootsuite#14596 
Port 46210a65d1 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:34:38 +02:00
Takeshi Umeda cd806663af [Glitch] Fix click range discrepancies in gifv 
Port debf6ae316 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:31:41 +02:00
ThibG 45d1f34a30 [Glitch] Fix scrolling issues when closing some dropdown menus 
Port c7cfd4e67a to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-08-30 16:31:02 +02:00
Thibaut Girka 8c3c27bf06 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
 2020-08-30 16:13:08 +02:00
Eugen Rochko 52157fdcba
Add support for dereferencing objects through bearcaps (#14683) 2020-08-30 12:34:20 +02:00
Eugen Rochko ce8f33dd2f
Fix inefficiencies in fan-out-on-write service (#14682) 2020-08-30 12:33:59 +02:00
Eugen Rochko bf477cee9f
Fix videos with near-60 fps being rejected (#14684) 
Fix #14668
 2020-08-30 01:54:30 +02:00
Thibaut Girka 30632adf9e Fix replying to some remote toots switching to local-only 2020-08-29 19:57:32 +02:00
Aurelia 8630afb468
fix: make Procfile compatible with herokuish (#12685) 
Co-authored-by: Aurelia <aurelia@serenitylabs.cloud>
 2020-08-29 19:00:30 +02:00
Akihiko Odaki 64ef37b89d
Introduce ApplicationController#cache_collection_paginated_by_id (#14677) 
* Replace incorrect use of distinct with group

Some uses of ActiveRecord::QueryMethods#distinct pass field names but they
are incorrect for the current version of Rails.

ActiveRecord::QueryMethods#group provides the expected behavior and
benefits performance. See commit 6da24aad4c.

* Introduce ApplicationController#cache_collection_paginated_by_id

ApplicationController#cache_collection_paginated_by_id fuses
ApplicationController#cache_collection and Paginable.paginate_by_id.

An advantage of this method is that it prevents from modifying scope which
Paginable.paginate_by_id may provide.
ApplicationController#cache_collection always return an array and there
is no possibility of the scope modification. It is also clear for a
programmer, considering the implication of "cache".

This method can also emit more efficient queries by using
Cacheable.cache_ids before calling Paginable.paginate_by_id.
 2020-08-28 12:31:56 +02:00
Akihiko Odaki b63ede5005
Eagerly load statuses with the main query in Api::V1::BookmarksController (#14674) 
This is same with commit 552e886b64 except
that it was for Api::V1::FavouritesController while this is for
Api::V1::BookmarksController.
 2020-08-28 12:30:23 +02:00
Akihiko Odaki e26e7a1cb5
Replace incorrect use of distinct with group (#14675) 
Some uses of ActiveRecord::QueryMethods#distinct pass field names but they
are incorrect for the current version of Rails.

ActiveRecord::QueryMethods#group provides the expected behavior and
benefits performance. See commit 6da24aad4c.
 2020-08-28 12:29:59 +02:00