fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 14:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
12249 commits 135 branches 266 tags 983 MiB
Commit graph

12249 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tateisu 370e38ee15
Add tootctl email-domain-blocks (#13589) 
* Add tootctl email_domains (block|unblock)

* fix codeclimate issues.

* fix codeclimate issues.

* fix codeclimate issues.

* add list subcommand, remove log_action.

* fix codeclimate issues.

* filter duplicate hostnames,ips before block

* rebase from currnet master branch.
rename email_domains_cli.rb to email_domain_blocks_cli.rb .
rename Mastodon::EmailDomainsCLI to Mastodon::EmailDomainBlocksCLI .
rename command email_domains to email-domain-blocks . (Thor recognizes both of - and _ )
rename subcommand block to add .
rename subcommand unblock to remove .
change the color in list subcommand to while for domain or cyan for childlen.
don't use include() in list subcommand.
suppress console output about succeeded entry.
add console output about count of processed/skipped.
remove capitalization in subcommand description.
remove long_desc in subcommand 'remove'.
remove duplicate where in subcommand 'remove'.

* fix codeclimate issue.
 2020-06-25 12:17:10 +02:00
Lerk 62ef6406cd
remove duplicated indexes according to pghero (#13695) 2020-06-25 12:15:34 +02:00
dependabot[bot] 0f8b8bf126
Bump @babel/plugin-proposal-decorators from 7.8.3 to 7.10.3 (#14137) 
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.8.3 to 7.10.3.
- [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.10.3/packages/babel-plugin-proposal-decorators)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 19:01:15 +09:00
dependabot[bot] 21f9cc4c62
Bump aws-sdk-s3 from 1.68.1 to 1.69.0 (#14109) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.68.1 to 1.69.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@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:49:34 +09:00
dependabot[bot] 3a8ccbae63
Bump aws-sigv4 from 1.1.4 to 1.2.0 (#14107) 
Bumps [aws-sigv4](https://github.com/aws/aws-sdk-ruby) from 1.1.4 to 1.2.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sigv4/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/1.1.4...1.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:49:05 +09:00
dependabot[bot] d272a324c1
Bump capybara from 3.32.2 to 3.33.0 (#14105) 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.32.2 to 3.33.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.32.2...3.33.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:48:40 +09:00
dependabot[bot] 034bd611ca
Bump rspec-sidekiq from 3.0.3 to 3.1.0 (#14104) 
Bumps [rspec-sidekiq](https://github.com/philostler/rspec-sidekiq) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/philostler/rspec-sidekiq/releases)
- [Changelog](https://github.com/philostler/rspec-sidekiq/blob/develop/CHANGES.md)
- [Commits](https://github.com/philostler/rspec-sidekiq/compare/v3.0.3...v3.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:47:34 +09:00
dependabot[bot] 0ab97c7b20
Bump excon from 0.74.0 to 0.75.0 (#14103) 
Bumps [excon](https://github.com/excon/excon) from 0.74.0 to 0.75.0.
- [Release notes](https://github.com/excon/excon/releases)
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt)
- [Commits](https://github.com/excon/excon/compare/v0.74.0...v0.75.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:46:11 +09:00
dependabot[bot] 1c2daaa1b5
Bump stackframe from 1.1.1 to 1.2.0 (#14082) 
Bumps [stackframe](https://github.com/stacktracejs/stackframe) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/stacktracejs/stackframe/releases)
- [Changelog](https://github.com/stacktracejs/stackframe/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stacktracejs/stackframe/compare/v1.1.1...v1.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:40:04 +09:00
dependabot[bot] 759662aa3f
Bump elasticsearch from 7.7.0 to 7.8.0 (#14108) 
Bumps [elasticsearch](https://github.com/elastic/elasticsearch-ruby) from 7.7.0 to 7.8.0.
- [Release notes](https://github.com/elastic/elasticsearch-ruby/releases)
- [Changelog](https://github.com/elastic/elasticsearch-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/elastic/elasticsearch-ruby/compare/7.7.0...v7.8.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 10:32:59 +02:00
dependabot[bot] cd1f5158b2
Bump eslint-visitor-keys from 1.1.0 to 1.2.0 (#14076) 
Bumps [eslint-visitor-keys](https://github.com/eslint/eslint-visitor-keys) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/eslint/eslint-visitor-keys/releases)
- [Changelog](https://github.com/eslint/eslint-visitor-keys/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint-visitor-keys/compare/v1.1.0...v1.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:31:29 +09:00
dependabot[bot] bd2550fad3
Bump acorn-walk from 7.1.1 to 7.2.0 (#14077) 
Bumps [acorn-walk](https://github.com/acornjs/acorn) from 7.1.1 to 7.2.0.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/7.1.1...7.2.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:31:03 +09:00
dependabot[bot] 5b2602fd1d
Bump loofah from 2.5.0 to 2.6.0 (#14071) 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.5.0 to 2.6.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.5.0...v2.6.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:27:36 +09:00
dependabot[bot] 32f330dbc0
Bump rdf from 3.1.2 to 3.1.3 (#14070) 
Bumps [rdf](https://github.com/ruby-rdf/rdf) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/ruby-rdf/rdf/releases)
- [Changelog](https://github.com/ruby-rdf/rdf/blob/develop/CHANGES.md)
- [Commits](https://github.com/ruby-rdf/rdf/compare/3.1.2...3.1.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:27:10 +09:00
dependabot[bot] e4503c49d1
Bump eslint-plugin-jsx-a11y from 6.2.3 to 6.3.1 (#14114) 
Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.2.3 to 6.3.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/jsx-eslint/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.2.3...v6.3.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:24:15 +09:00
dependabot[bot] 6d12067b7f
Bump parser from 2.7.1.3 to 2.7.1.4 (#14101) 
Bumps [parser](https://github.com/whitequark/parser) from 2.7.1.3 to 2.7.1.4.
- [Release notes](https://github.com/whitequark/parser/releases)
- [Changelog](https://github.com/whitequark/parser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/parser/compare/v2.7.1.3...v2.7.1.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:22:53 +09:00
dependabot[bot] 844393ec29
Bump aws-partitions from 1.329.0 to 1.332.0 (#14110) 
Bumps [aws-partitions](https://github.com/aws/aws-sdk-ruby) from 1.329.0 to 1.332.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-06-25 17:22:35 +09:00
dependabot[bot] 2e88dc33d3
Bump fast-deep-equal from 3.1.1 to 3.1.3 (#14111) 
Bumps [fast-deep-equal](https://github.com/epoberezkin/fast-deep-equal) from 3.1.1 to 3.1.3.
- [Release notes](https://github.com/epoberezkin/fast-deep-equal/releases)
- [Commits](https://github.com/epoberezkin/fast-deep-equal/compare/v3.1.1...v3.1.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:21:06 +09:00
dependabot[bot] 0d258eaa10
Bump @babel/core from 7.10.2 to 7.10.3 (#14112) 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.2 to 7.10.3.
- [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.10.3/packages/babel-core)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:19:30 +09:00
dependabot[bot] f0f1161939
Bump elliptic from 6.5.2 to 6.5.3 (#14115) 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:16:59 +09:00
dependabot[bot] 7afc31d793
Bump es-abstract from 1.17.5 to 1.17.6 (#14117) 
Bumps [es-abstract](https://github.com/ljharb/es-abstract) from 1.17.5 to 1.17.6.
- [Release notes](https://github.com/ljharb/es-abstract/releases)
- [Changelog](https://github.com/ljharb/es-abstract/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ljharb/es-abstract/compare/v1.17.5...v1.17.6)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-25 17:13:54 +09:00
Eugen Rochko 662a49dc3f
Fix various issues around OpenGraph representation of media (#14133) 
- Fix audio attachments not being represented in OpenGraph tags
- Fix audio being represented as "1 image" in OpenGraph descriptions
- Fix video metadata being overwritten by paperclip-av-transcoder
- Fix embedded player not using Mastodon's UI
- Fix audio/video progress bars not moving smoothly
- Fix audio/video buffered bars not displaying correctly
 2020-06-25 01:33:01 +02:00
ThibG e9ff61ca07
Remove unused dependency on wavesurfer.js (#14136) 
It's not used anymore now that the audio player design has changed again.
 2020-06-24 22:54:06 +02:00
ThibG ddcdddd6fc
Change streaming server to treat blank redis password as password-less auth (#14135) 
Fixes #14131

Our `mastodon:setup` task defaults to a blank password rather than the
absence of password, but some versions of Redis reject blank password
authentication when authentication is possible without a password.

The Ruby code only uses the Redis password when it's not blank, so
do the same for the node.js part.
 2020-06-24 22:25:23 +02:00
ThibG 8f4aff9b6f
Merge pull request #1361 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-06-24 17:06:26 +02:00
ThibG 72d193654b [Glitch] Fix very wide media attachments resulting in too thin a thumbnail 
Port d469247083 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 16:01:28 +02:00
Takeshi Umeda 83bc9f68af [Glitch] Fix modifier key to keep the EmojiPicker on macOS 
Port 434a6d0b15 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:56:43 +02:00
fuyu 51922d7ffa [Glitch] Fix unnecessary gap under of video modal 
Port cb3c6d1780 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-24 15:55:53 +02:00
Thibaut Girka aae60a2366 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/sign_in_token_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
- `app/controllers/concerns/two_factor_authentication_concern.rb`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes.
 2020-06-24 15:33:41 +02:00
Eugen Rochko bb9ca8a587
Fix audio/video/images/cards not reacting to window resizes in web UI (#14130) 
* Fix audio/video/images/cards not reacting to window resizes in web UI

* Update app/javascript/mastodon/features/audio/index.js

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2020-06-24 10:25:32 +02:00
ThibG d469247083
Fix very wide media attachments resulting in too thin a thumbnail (#14127) 
Fixes #14094
 2020-06-23 17:24:29 +02:00
ThibG 01a99f7ec7
Fix crash in MergeWorker (#14129) 
Similarly to #12324, the code is passing an Account object where an id
is expected.
 2020-06-23 16:40:01 +02:00
Thibaut Girka 5d12b63e79 Simplify filtering condition 2020-06-23 16:09:36 +02:00
ash lea c1377049c6 never filter own posts from timeline 2020-06-23 16:09:36 +02:00
ThibG 791402af7c
never filter own posts from timeline (#14128) 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>

Co-authored-by: ash lea <example@thisismyactual.email>
 2020-06-23 16:01:34 +02:00
Eugen Rochko 419ad6248b
Change volume control and download buttons in web UI (#14122) 
* Fix audio download button not starting download in web UI

* Fix volume controls on audio and video players in web UI

* Remove download button from video player in web UI
 2020-06-23 12:20:14 +02:00
ThibG aaf91abffa
Fix audio player not working when media files are hosted on a different domain (#14118) 2020-06-22 19:24:16 +02:00
ThibG c6904c0d37
Fix unique username constraint for local users not being enforced in database (#14099) 
This should not be an issue in practice because of the Rails-level uniqueness
check, but local accounts having a NULL domain means the uniqueness constraint
did not apply to them (since no two NULL values are considered equal).
 2020-06-21 12:41:38 +02:00
Eugen Rochko 75a2b8f815
Change design of audio players in web UI (#14095) 2020-06-21 02:27:19 +02:00
dependabot[bot] f111b71d1c
Bump eslint-import-resolver-node from 0.3.3 to 0.3.4 (#14081) 
Bumps [eslint-import-resolver-node](https://github.com/benmosher/eslint-plugin-import) from 0.3.3 to 0.3.4.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/resolvers/node/v0.3.3...resolvers/node/v0.3.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:32:23 +09:00
dependabot[bot] 975c943432
Bump fast-glob from 3.2.2 to 3.2.4 (#14079) 
Bumps [fast-glob](https://github.com/mrmlnc/fast-glob) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/mrmlnc/fast-glob/releases)
- [Commits](https://github.com/mrmlnc/fast-glob/compare/3.2.2...3.2.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:32:02 +09:00
dependabot[bot] 1b29574a54
Bump sass from 1.26.5 to 1.26.8 (#14078) 
Bumps [sass](https://github.com/sass/dart-sass) from 1.26.5 to 1.26.8.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.26.5...1.26.8)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:30:09 +09:00
dependabot[bot] 25cd4998fe
Bump aws-sdk-core from 3.99.2 to 3.100.0 (#14072) 
Bumps [aws-sdk-core](https://github.com/aws/aws-sdk-ruby) from 3.99.2 to 3.100.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-06-21 08:28:45 +09:00
dependabot[bot] 02fc97928c
Bump nearley from 2.19.3 to 2.19.4 (#14075) 
Bumps [nearley](https://github.com/hardmath123/nearley) from 2.19.3 to 2.19.4.
- [Release notes](https://github.com/hardmath123/nearley/releases)
- [Commits](https://github.com/hardmath123/nearley/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:27:50 +09:00
dependabot[bot] 3bf3b4cb22
Bump electron-to-chromium from 1.3.448 to 1.3.475 (#14068) 
Bumps [electron-to-chromium](https://github.com/kilian/electron-to-chromium) from 1.3.448 to 1.3.475.
- [Release notes](https://github.com/kilian/electron-to-chromium/releases)
- [Changelog](https://github.com/Kilian/electron-to-chromium/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kilian/electron-to-chromium/compare/v1.3.448...v1.3.475)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:26:21 +09:00
dependabot[bot] d22931454e
Bump caniuse-lite from 1.0.30001078 to 1.0.30001084 (#14083) 
Bumps [caniuse-lite](https://github.com/ben-eb/caniuse-lite) from 1.0.30001078 to 1.0.30001084.
- [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.30001078...v1.0.30001084)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-21 08:25:05 +09:00
Takeshi Umeda 434a6d0b15
Fix modifier key to keep the EmojiPicker on macOS (#14096) 2020-06-20 13:30:40 +02:00
fuyu cb3c6d1780
Fix unnecessary gap under of video modal (#14098) 2020-06-20 13:30:27 +02:00
fuyu a279acc730
Fix not working I18n on 2FA and Sign in token page (#14087) 2020-06-20 13:30:13 +02:00
ThibG ac8a788370
Fix functional user requirements in whitelist mode (#14093) 
Fixes #14092
 2020-06-19 19:18:47 +02:00