1
0
puyopuyotetr.is/lib/mastodon
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
2020-05-10 16:19:56 +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 Add separate cache directory for non-local uploads (#12821) 2020-04-26 23:29:08 +02:00
domains_cli.rb Change tootctl domains purge to accept multiple domains at once (#12046) 2019-10-02 04:49:53 +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 Fix "tootctl media remove-orphans" crashing on “Import” files (#13685) 2020-05-09 21:06:55 +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 Fix installation failing when Redis password contains special characters (#13156) 2020-02-29 03:00:43 +01:00
search_cli.rb Add parallelization to tootctl search deploy (#12051) 2019-10-02 21:50:43 +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 failing to delete empty directories (#13593) 2020-05-04 13:51:34 +02:00
version.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-04-05 18:32:06 +02:00