tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
12,145 Commits 20 Branches 113 Tags 222 MiB
511edccf61
Commit Graph

12145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka
59e92004b3 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
 2020-06-17 17:10:15 +02:00
dependabot[bot]
b1d492f30a
Bump parallel from 1.19.1 to 1.19.2 (#14069) 
Bumps [parallel](https://github.com/grosser/parallel) from 1.19.1 to 1.19.2.
- [Release notes](https://github.com/grosser/parallel/releases)
- [Commits](https://github.com/grosser/parallel/compare/v1.19.1...v1.19.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-17 20:18:43 +09:00
mayaeh
f56129a947
Suppress Redis#exists(key) warning (#14067) 2020-06-17 10:31:31 +02:00
dependabot[bot]
f5e6cbacf3
Bump capistrano from 3.14.0 to 3.14.1 (#14037) 
* Bump capistrano from 3.14.0 to 3.14.1

Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.0 to 3.14.1.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.0...v3.14.1)

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

* Bump capistrano from 3.14.0 to 3.14.1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2020-06-17 06:31:30 +02:00
mayaeh
437cdf89e0
[Security] Bump rack from 2.2.2 to 2.2.3 (#14064) 2020-06-17 06:30:57 +02:00
dependabot[bot]
ee3e709e74
Bump sanitize from 5.2.0 to 5.2.1 (#14063) 
Bumps [sanitize](https://github.com/rgrove/sanitize) from 5.2.0 to 5.2.1.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/master/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v5.2.0...v5.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-17 10:15:54 +09:00
dependabot[bot]
06262afeb2
Bump parallel_tests from 2.32.0 to 3.0.0 (#14044) 
Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.32.0 to 3.0.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/v2.32.0...v3.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-16 01:00:56 +09:00
dependabot[bot]
a26f9cc0b1
Bump bundler-audit from 0.6.1 to 0.7.0.1 (#14034) 
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.1 to 0.7.0.1.
- [Release notes](https://github.com/postmodern/bundler-audit/releases)
- [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md)
- [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.1...v0.7.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-16 00:57:20 +09:00
dependabot[bot]
764fc04957
Bump jest from 25.4.0 to 26.0.1 (#14056) 
Bumps [jest](https://github.com/facebook/jest) from 25.4.0 to 26.0.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v25.4.0...v26.0.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:48:15 +09:00
ThibG
755e8c76ab
Fix initial audio volume not corresponding to what's displayed (#14057) 2020-06-15 16:43:30 +02:00
dependabot[bot]
df30002df8
Bump excon from 0.73.0 to 0.74.0 (#14046) 
Bumps [excon](https://github.com/excon/excon) from 0.73.0 to 0.74.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.73.0...v0.74.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:41:18 +09:00
dependabot[bot]
e009dcd1ab
Bump eslint-plugin-import from 2.20.2 to 2.21.2 (#14054) 
Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.20.2 to 2.21.2.
- [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/v2.20.2...v2.21.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:38:23 +09:00
dependabot[bot]
0d5570b631
Bump css-loader from 3.5.3 to 3.6.0 (#14041) 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.5.3...v3.6.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:37:30 +09:00
dependabot[bot]
a3a68445f1
Bump devise from 4.7.1 to 4.7.2 (#14045) 
Bumps [devise](https://github.com/plataformatec/devise) from 4.7.1 to 4.7.2.
- [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.1...v4.7.2)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:31:04 +09:00
dependabot[bot]
36f3f874c8
Bump net-ssh from 6.0.2 to 6.1.0 (#14050) 
Bumps [net-ssh](https://github.com/net-ssh/net-ssh) from 6.0.2 to 6.1.0.
- [Release notes](https://github.com/net-ssh/net-ssh/releases)
- [Changelog](https://github.com/net-ssh/net-ssh/blob/master/CHANGES.txt)
- [Commits](https://github.com/net-ssh/net-ssh/compare/v6.0.2...v6.1.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:28:56 +09:00
dependabot[bot]
175befd398
Bump rubocop-rails from 2.5.2 to 2.6.0 (#14047) 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.5.2 to 2.6.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.5.2...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-15 23:26:27 +09:00
dependabot[bot]
3aa33948cd
Bump @babel/plugin-transform-react-inline-elements from 7.9.0 to 7.10.1 (#14048) 
Bumps [@babel/plugin-transform-react-inline-elements](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-transform-react-inline-elements) from 7.9.0 to 7.10.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.1/packages/babel-plugin-transform-react-inline-elements)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:25:17 +09:00
dependabot[bot]
ee86d9f235
Bump httplog from 1.4.2 to 1.4.3 (#14043) 
Bumps [httplog](https://github.com/trusche/httplog) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.4.2...v1.4.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:22:01 +09:00
dependabot[bot]
cd3f069e85
Bump merge2 from 1.3.0 to 1.4.1 (#14052) 
Bumps [merge2](https://github.com/teambition/merge2) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/teambition/merge2/releases)
- [Commits](https://github.com/teambition/merge2/compare/v1.3.0...v1.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:20:20 +09:00
dependabot[bot]
1357cc7a12
Bump jsx-ast-utils from 2.3.0 to 2.4.1 (#14040) 
Bumps [jsx-ast-utils](https://github.com/evcohen/jsx-ast-utils) from 2.3.0 to 2.4.1.
- [Release notes](https://github.com/evcohen/jsx-ast-utils/releases)
- [Changelog](https://github.com/jsx-eslint/jsx-ast-utils/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/jsx-ast-utils/compare/2.3.0...v2.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:19:18 +09:00
dependabot[bot]
d2e7813c62
Bump node-releases from 1.1.57 to 1.1.58 (#14053) 
Bumps [node-releases](https://github.com/chicoxyzzy/node-releases) from 1.1.57 to 1.1.58.
- [Release notes](https://github.com/chicoxyzzy/node-releases/releases)
- [Commits](https://github.com/chicoxyzzy/node-releases/compare/v1.1.57...v1.1.58)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:17:43 +09:00
dependabot[bot]
153e8c281c
Bump opencollective-postinstall from 2.0.2 to 2.0.3 (#14042) 
Bumps [opencollective-postinstall](https://github.com/opencollective/opencollective-postinstall) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/opencollective/opencollective-postinstall/releases)
- [Commits](https://github.com/opencollective/opencollective-postinstall/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:16:25 +09:00
dependabot[bot]
e872197d55
Bump redis from 4.1.4 to 4.2.1 (#14038) 
Bumps [redis](https://github.com/redis/redis-rb) from 4.1.4 to 4.2.1.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.4...v4.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:11:20 +09:00
dependabot[bot]
10857f4177
Bump regenerate from 1.4.0 to 1.4.1 (#14051) 
Bumps [regenerate](https://github.com/mathiasbynens/regenerate) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/mathiasbynens/regenerate/releases)
- [Commits](https://github.com/mathiasbynens/regenerate/compare/v1.4.0...v1.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 23:10:30 +09:00
dependabot[bot]
b82cd65edd
Bump ast from 2.4.0 to 2.4.1 (#14035) 
Bumps [ast](https://github.com/whitequark/ast) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/whitequark/ast/releases)
- [Changelog](https://github.com/whitequark/ast/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitequark/ast/compare/v2.4.0...v2.4.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-15 22:46:37 +09:00
dependabot[bot]
cfb8b285d2
Bump aws-sdk-s3 from 1.67.1 to 1.68.1 (#14033) 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.67.1 to 1.68.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-06-15 22:31:23 +09:00
fuyu
728148c2e5
Add a default DB_HOST to .env.vagrant for enable the streaming (#14030) 2020-06-15 01:57:06 +02:00
Eugen Rochko
3e9dc4044b
Add hints about incomplete remote content to web UI (#14031) 2020-06-14 22:29:40 +02:00
fuyu
b1484cf3ce
Fixed emoji detection problem to append border (#14020) 
* Fixed emoji detection problem to append border

* Add tests

* Add missing semicolon

* Fixed wrong result when includes different variation selector

* Add missing semicolon

* Remove grapheme-splitter and Change emoji list to array from string

* Update comment

* Remove spaces

Co-authored-by: ThibG <thib@sitedethib.com>
 2020-06-10 21:56:14 +02:00
Shlee
91055f497f
Update Elasticsearch from 6.1 to 6.8 in docker-compose.yml (Fix glitch-soc#1348) (#14016) 
* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml

* Update docker-compose.yml
 2020-06-10 13:57:30 +02:00
ThibG
c813789e06
Fix TL sometimes jumping when closing modals (#14019) 
Fixes #14018
 2020-06-10 13:57:13 +02:00
ThibG
0a5cf075cd
Merge pull request #1356 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-06-10 12:12:14 +02:00
Thibaut Girka
b9d75e49c2 Merge branch 'master' into glitch-soc/merge-upstream 2020-06-10 12:10:26 +02:00
ThibG
cc6b8a9615
Fix WebUI crash when processing accounts before page is loaded (#14015) 2020-06-09 20:53:20 +02:00
Thibaut Girka
34d92e0233 Disable dependabot 2020-06-09 13:09:17 +02:00
ThibG
3287a10fe9
Merge pull request #1350 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2020-06-09 13:00:24 +02:00
Thibaut Girka
e9d7ca7645 [Glitch] Fix WebUI crash when loading account data before page is loaded 2020-06-09 11:55:07 +02:00
Thibaut Girka
b826e504b4 Disable E2EE-related routes 
Not that I think they are an issue, but the API is likely to change, and
isn't versioned, so I don't want to that be an issue since we also don't
have clear versioning in glitch-soc.
 2020-06-09 11:16:42 +02:00
ThibG
00cd919750 [Glitch] Add hotkey for toggling content warning composer field 
Port 6b6a9d0ea3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:14:20 +02:00
Thibaut Girka
5e07deefc1 Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 11:12:53 +02:00
ThibG
304721edc1 [Glitch] Improve rendering of emoji which do not contrast with background 
Port db319c0fdc to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:07:32 +02:00
Ben Lubar
4657c1a1ca [Glitch] FIX: filters ignore media descriptions 
Port c66403b257 to glitch-soc

Co-authored-by: Thibaut Girka <thib@sitedethib.com>
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:02:24 +02:00
ThibG
776aff9656 [Glitch] Hide sensitive preview cards with blurhash 
Port 8e96510b25 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 11:01:31 +02:00
Yamagishi Kazutoshi
2da2f7f7c2 [Glitch] Fix ref attr for react-textarea-autozsize 
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2020-06-09 10:55:52 +02:00
Thibaut Girka
12c8ac9e14 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict due to glitch-soc having to take care of local-only
  pinned toots in that controller.
  Took upstream's changes and restored the local-only special
  handling.
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflicts due to the theming system, applied upstream
  changes, adapted the following two files for glitch-soc's
  theming system:
  - `app/controllers/concerns/sign_in_token_authentication_concern.rb`
  - `app/controllers/concerns/two_factor_authentication_concern.rb`
- `app/services/backup_service.rb`:
  Minor conflict due to glitch-soc having to handle local-only
  toots specially. Applied upstream changes and restored
  the local-only special handling.
- `app/views/admin/custom_emojis/index.html.haml`:
  Minor conflict due to the theming system.
- `package.json`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
- `yarn.lock`:
  Upstream dependency updated, too close to a glitch-soc-only
  dependency in the file.
 2020-06-09 10:39:20 +02:00
ThibG
6b6a9d0ea3
Add hotkey for toggling content warning composer field (#13987) 2020-06-09 10:32:32 +02:00
ThibG
89f40b6c3e
Make domain block/silence/reject-media code more robust (#13424) 
* Split media cleanup from reject-media domain blocks to its own service

* Slightly improve ClearDomainMediaService error handling

* Lower DomainClearMediaWorker to lowest-priority queue

* Do not catch ActiveRecord::RecordNotFound in domain block workers

* Fix DomainBlockWorker spec labels

* Add some specs

* Change domain blocks to immediately mark accounts as suspended

Rather than doing so sequentially, account after account, while cleaning
their data. This doesn't change much about the time the block takes to
complete, but it immediately prevents interaction with the blocked domain,
while up to now, it would only be guaranteed when the process ends.
 2020-06-09 10:32:00 +02:00
Bei Li
384d64894a
Update “status” to “toot” for en.json (#13877) 2020-06-09 10:28:57 +02:00
ThibG
db319c0fdc
Improve rendering of emoji which do not contrast with background (#13772) 
* Refactor list of emoji requiring added outlines so that it can be theme-specific

* Split inaccessible emoji to emoji requiring an outline and ones that can be inverted

* Drop the “silouhettes” from black emoji as they seem to have changed color

* Add inaccessible emojis list for the light theme

* Use bordered emoji variant instead of unreliable CSS
 2020-06-09 10:28:23 +02:00
Mélanie Chauvel
ac3c83ef6f
Improve wording and add titles on moderated servers section in /about/more (#13930) 2020-06-09 10:28:02 +02:00