mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-15 15:44:56 +01:00
Code Issues Projects Releases Wiki Activity
14,519 Commits 137 Branches 269 Tags 929 MiB
1b386c881c
Commit Graph

14519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire
c5751f8377
Merge pull request #1643 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-30 17:34:22 +01:00
Claire
5bf3a09c5b Merge branch 'main' into glitch-soc/merge-upstream 2021-11-30 12:13:54 +01:00
Eugen Rochko
a458b74c7e
Fix error on trending mailer due to missing constant (#17072) 2021-11-29 17:39:40 +01:00
dependabot[bot]
f200775fde
Bump @babel/plugin-transform-runtime from 7.16.0 to 7.16.4 (#17023) 
Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-runtime) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-plugin-transform-runtime)

---
updated-dependencies:
- dependency-name: "@babel/plugin-transform-runtime"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2021-11-29 15:41:17 +09:00
dependabot[bot]
87ed4e7e45
Bump cld3 from 3.4.2 to 3.4.3 (#17047) 
Bumps [cld3](https://github.com/akihikodaki/cld3-ruby) from 3.4.2 to 3.4.3.
- [Release notes](https://github.com/akihikodaki/cld3-ruby/releases)
- [Commits](https://github.com/akihikodaki/cld3-ruby/compare/v3.4.2...v3.4.3)

---
updated-dependencies:
- dependency-name: cld3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 15:19:22 +09:00
dependabot[bot]
9380318681
Bump aws-sdk-s3 from 1.106.0 to 1.107.0 (#17048) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.106.0 to 1.107.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 15:18:59 +09:00
dependabot[bot]
7be9c31862
Bump @babel/preset-env from 7.16.0 to 7.16.4 (#17024) 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-29 15:18:41 +09:00
Jeong Arm
4a109ec1ba
Fix server graph on admin/tags/:id (#17066) 2021-11-28 23:13:07 +01:00
Alexandra Catalina
af93d938d4
Update tootsuite/mastodon Docker tag to v3.4.4 (#17065) 
Co-authored-by: Renovate Bot <bot@renovateapp.com>
 2021-11-27 03:06:39 +01:00
Claire
4aec8087c7
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 23:41:01 +01:00
Claire
ca5d78816b [Glitch] Fix searching for additional hashtags in hashtag column 
Port 3f382e337d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:46 +01:00
Claire
d5d44b431a [Glitch] Fix color of hashtag column settings inputs 
Port 1630807ee2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-26 22:58:13 +01:00
Claire
9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
 2021-11-26 22:53:55 +01:00
Jeong Arm
1c826471e7
Fix admin statuses order(#16937) (#16969) 
* Fix #16937

* Add test for statuses order
 2021-11-26 22:12:27 +01:00
Claire
3f382e337d
Fix searching for additional hashtags in hashtag column (#17054) 2021-11-26 22:11:09 +01:00
Claire
1630807ee2
Fix color of hashtag column settings inputs (#17058) 
Fixes #17057
 2021-11-26 22:09:11 +01:00
Takeshi Umeda
0ac7efdc50
Fix performance of tootctl statuses remove (#17052) 
* Fix performance of tootctl statuses remove

* Fix model class
 2021-11-26 22:08:47 +01:00
Claire
ddcb9da74f
Fix opening wrong profile when clicking on username of boosting user in WebUI (#17060) 
Fixes #16799
 2021-11-26 22:04:09 +01:00
zunda
912c6b3f49
Upgrade bootsnap for Ruby 3.0.3 (#17064) 
https://github.com/Shopify/bootsnap/blob/v1.9.3/CHANGELOG.md#193
 2021-11-26 22:03:35 +01:00
Jeong Arm
97151840b0 [Glitch] Port upstream changes about trending links 2021-11-26 11:36:22 +01:00
Takeshi Umeda
06631fdc53
Fix ElasticSearch to Elasticsearch (#17050) 2021-11-26 08:30:02 +01:00
OSAMU SATO
53aca8aecf
Add batch_size option to bin/tootctl search deploy (#17049) 2021-11-26 08:29:53 +01:00
dependabot[bot]
0909874c08 Bump sprockets-rails from 3.4.0 to 3.4.1 (#17021) 
Bumps [sprockets-rails](https://github.com/rails/sprockets-rails) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/rails/sprockets-rails/releases)
- [Commits](https://github.com/rails/sprockets-rails/compare/v3.4.0...v3.4.1)

---
updated-dependencies:
- dependency-name: sprockets-rails
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:06:23 +09:00
dependabot[bot]
45f8eb110a
Bump eslint-plugin-react from 7.27.0 to 7.27.1 (#17022) 
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.27.0 to 7.27.1.
- [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.27.0...v7.27.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:06:12 +09:00
dependabot[bot]
5b8928fef9
Bump reselect from 4.1.2 to 4.1.4 (#17025) 
Bumps [reselect](https://github.com/reduxjs/reselect) from 4.1.2 to 4.1.4.
- [Release notes](https://github.com/reduxjs/reselect/releases)
- [Changelog](https://github.com/reduxjs/reselect/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/reselect/compare/v4.1.2...v4.1.4)

---
updated-dependencies:
- dependency-name: reselect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:01:53 +09:00
dependabot[bot]
9a77a16087
Bump @babel/plugin-proposal-decorators from 7.16.0 to 7.16.4 (#17027) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.16.0 to 7.16.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.16.4/packages/babel-plugin-proposal-decorators)

---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-11-26 14:01:31 +09:00
Eugen Rochko
7de0ee7aba
Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
Claire
025a2ceb0f
Merge pull request #1637 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:25:29 +01:00
Claire
3304df0ab5 Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 01:15:32 +01:00
Claire
afd71867ba Revert "Fix trends admin page crashing" 
This reverts commit 5f10e64330.
 2021-11-26 01:15:29 +01:00
Eugen Rochko
12b3ff6c6d
Fix error on trending hashtags/links pages in admin UI due to missing constant (#17044) 2021-11-26 01:12:39 +01:00
Claire
b4f785c1f4
Merge pull request #1636 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-26 01:12:09 +01:00
Claire
5f10e64330 Fix trends admin page crashing 2021-11-26 00:50:13 +01:00
Claire
0ccaedc92b Disable trending links review request emails 2021-11-25 23:55:05 +01:00
Claire
67c4e8e317 [Glitch] Fix handling of recursive toots in WebUI 
Port b1fd6d4490 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-25 23:52:22 +01:00
Claire
443ec4f8ba Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`
 2021-11-25 23:50:35 +01:00
Claire
b1fd6d4490
Fix handling of recursive toots in WebUI (#17041) 2021-11-25 23:46:39 +01:00
Claire
013bee6afb
Fix filtering DMs from non-followed users (#17042) 2021-11-25 23:46:30 +01:00
Claire
8c2fe2a846
Merge pull request #1635 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-25 20:21:25 +01:00
Claire
534b0a2704 Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 18:42:18 +01:00
Eugen Rochko
6e50134a42
Add trending links (#16917) 
* Add trending links

* Add overriding specific links trendability

* Add link type to preview cards and only trend articles

Change trends review notifications from being sent every 5 minutes to being sent every 2 hours

Change threshold from 5 unique accounts to 15 unique accounts

* Fix tests
 2021-11-25 13:07:38 +01:00
zunda
46e62fc4b3
Upgrade Ruby to 3.0.3 (#17038) 
https://www.ruby-lang.org/en/news/2021/11/24/ruby-3-0-3-released/
 2021-11-24 20:29:05 +01:00
trwnh
08a7c5139d
Better ordering for bug report issue template (#17019) 
Logically, it makes more sense to provide the steps leading up to the bug before asking what the bug is. This change moves "steps to reproduce" above "expected behavior" and "actual behavior" to enforce the above progression and logical flow.
 2021-11-24 20:24:09 +01:00
Claire
02a87431cf
Fix error when suspending user with an already-existing canonical email block (#17036) 
* Fix error when suspending user with an already-existing canonical email block

Fixes #17033

While attempting to create a `CanonicalEmailBlock` with an existing hash would
raise an `ActiveRecord::RecordNotUnique` error, this being done within a
transaction would cancel the whole transaction. For this reason, checking for
uniqueness in Rails would query the database within the transaction and avoid
invalidating the whole transaction for this reason.

A race condition is still possible, where multiple accounts sharing a canonical
email would be blocked in concurrent transactions, in which only one would
succeed, but that is way less likely to happen that the current issue, and can
always be retried after the first failure, unlike the current situation.

* Add tests
 2021-11-24 17:41:03 +01:00
Claire
9c44cf205f
Add FEDERATION.md (#17029) 
Some ActivityPub projects have a FEDERATION.md which is used to describe the
various extensions they use.

Everything here is also documented elsewhere, but it's a concise starting point
with links to that documentation.
 2021-11-23 00:15:31 +01:00
Claire
3ba7c85ec9
Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2021-11-19 19:55:02 +01:00
Claire
189cf652e6 [Glitch] Fix overflow of long profile fields in admin view 
Port db32835338 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2021-11-19 18:55:27 +01:00
Claire
2b4c7beb73 Merge branch 'main' into glitch-soc/merge-upstream 2021-11-19 18:51:41 +01:00
Claire
db32835338
Fix overflow of long profile fields in admin view (#17010) 2021-11-19 18:22:49 +01:00
Claire
6159020617
Fix background-color of emoji-mart selector (#17011) 
Reverts part of #16907 to fix hardcoded color
 2021-11-19 18:21:37 +01:00