1
0
puyopuyotetr.is/lib/mastodon
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
..
accounts_cli.rb Add --reset-password option to tootctl accounts modify (#13126) 2020-02-22 01:29:14 +01:00
cache_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
cli_helper.rb Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
domains_cli.rb Remove the terms blacklist and whitelist from UX (#14149) 2020-06-27 20:20:11 +02:00
email_domain_blocks_cli.rb Improve email address validation (#14565) 2020-08-12 12:40:25 +02:00
emoji_cli.rb Add tootctl emoji export (#13534) 2020-04-27 22:17:49 +02:00
feeds_cli.rb Fix tootctl not allocating enough database connections for main thread (#12097) 2019-10-07 05:05:02 +02:00
media_cli.rb Add --fix-permissions option to tootctl media remove-orphans (#14383) 2020-09-01 03:33:21 +02:00
migration_helpers.rb Do not suggest to login into the GitLab database (#13084) 2020-02-15 12:52:57 +01:00
premailer_webpack_strategy.rb ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) 2018-01-29 01:06:39 +01:00
preview_cards_cli.rb Change tootctl to use inline parallelization instead of Sidekiq (#11776) 2019-09-10 13:48:48 +02:00
redis_config.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 2020-09-01 03:04:00 +02:00
search_cli.rb Change tootctl search deploy algorithm (#14300) 2020-07-14 18:10:35 +02:00
settings_cli.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
snowflake.rb Fixes/do not override timestamps (#7336) 2018-05-03 23:02:46 +02:00
statuses_cli.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
upgrade_cli.rb Fix tootctl upgrade storage-schema S3 ACL (#13768) 2020-05-17 17:27:36 +02:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-09-01 17:02:18 +02:00