mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00
Code Issues Projects Releases Wiki Activity
mastodon/config/initializers
History
Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/settings/preferences_controller.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/lib/user_settings_decorator.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/models/status.rb`:
  Conflict because of slight change in how glitch-soc handles the scope to
  filter out local-only posts for anonymous viewers.
  Took upstream's changes and re-applied glitch-soc's change.
- `app/models/user.rb`:
  Conflicts due to us having more user settings and upstream dropping
  `hide_network` (to replace it with an account attribute, properly migrated).
  Dropped `hide_network` like upstream.
- `app/views/directories/index.html.haml`:
  Conflict because upstream redesigned that page while glitch-soc had a minor
  change to support hiding the number of followers.
  Ported glitch-soc's change on top of upstream's redesign.

Additional changes:
- `app/models/account_statuses_filter.rb`:
  See change to `app/models/status.rb`.
2022-03-08 20:22:54 +01:00
..
0_duplicate_migrations.rb
Fix ActiveRecord monkey-patching migration hack
2021-03-24 10:55:02 +01:00
0_post_deployment_migrations.rb
Add post-deployment migration system (#8182)
2018-08-13 18:17:20 +02:00
1_hosts.rb
Fix host check on healthcheck path not being disabled (#16270)
2021-05-17 22:36:08 +02:00
2_whitelist_mode.rb
Remove the terms blacklist and whitelist from UX (#14149)
2020-06-27 20:20:11 +02:00
active_model_serializers.rb
Fix ActivityPub context not being dynamically computed (#11746)
2019-09-03 22:52:32 +02:00
application_controller_renderer.rb
Update Mastodon to Rails 6.1 (#15910)
2021-03-24 10:44:31 +01:00
assets.rb
HTML e-mails for UserMailer (#6256)
2018-01-16 03:29:11 +01:00
backtrace_silencers.rb
Update Mastodon to Rails 6.1 (#15910)
2021-03-24 10:44:31 +01:00
blacklists.rb
Remove the terms blacklist and whitelist from UX (#14149)
2020-06-27 20:20:11 +02:00
cache_buster.rb
Add cache buster feature for media files (#15155)
2020-11-19 17:38:06 +01:00
chewy.rb
Fix ElasticSearch to Elasticsearch (#17050)
2021-11-26 08:30:02 +01:00
content_security_policy.rb
Merge branch 'main' into glitch-soc/merge-upstream
2021-04-20 12:17:14 +02:00
cookies_serializer.rb
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00
cors.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-15 10:45:53 +01:00
devise.rb
Remove IP tracking columns from users table (#16409)
2022-01-16 13:23:50 +01:00
doorkeeper.rb
Fix app name, website and redirect URIs not having a maximum length (#16042)
2021-04-15 16:28:43 +02:00
fast_blank.rb
Fixed code quality issues (#15541)
2021-01-31 21:26:09 +01:00
ffmpeg.rb
add ffmpeg initializer (#8855)
2018-10-09 03:02:52 +02:00
filter_parameter_logging.rb
Added optional two-factor authentication
2017-01-27 20:35:16 +01:00
http_client_proxy.rb
Refactor monkey-patching of Goldfinger (#12561)
2020-05-10 11:41:43 +02:00
httplog.rb
Version bumps for ruby and misc gems (#1159)
2017-04-10 22:47:41 +02:00
inflections.rb
Prepare Mastodon for zeitwerk autoloader (#15917)
2021-03-19 02:42:43 +01:00
json_ld.rb
Fix preloaded JSON-LD context for identity not being used (#12138)
2019-10-10 06:48:53 +02:00
kaminari_config.rb
Add ability to filter audit log in admin UI (#13381)
2020-04-03 13:06:34 +02:00
locale.rb
Move glitch-specific ruby-side locales to their own files
2020-05-30 12:54:17 +02:00
mail_delivery_job.rb
Fix mailer jobs for deleted notifications erroring out (#16294)
2021-05-24 03:02:46 +02:00
makara.rb
Drop dependency on secure_headers, fix response headers (#15712)
2021-02-11 23:47:05 +01:00
mime_types.rb
Set correct content-type for ActivityPub JSON (#4592)
2017-08-14 04:16:43 +02:00
oj.rb
Remove rabl dependency (#5894)
2017-12-06 15:04:49 +09:00
omniauth.rb
Spelling (#17705)
2022-03-06 22:51:40 +01:00
open_uri_redirection.rb
Optimize some regex matching (#15528)
2021-01-22 10:09:08 +01:00
paperclip.rb
Fix autoloading deprecation warnings from Rails 6 (#16010)
2021-04-09 02:31:20 +02:00
permissions_policy.rb
Update Mastodon to Rails 6.1 (#15910)
2021-03-24 10:44:31 +01:00
preload_link_headers.rb
Fix various typos (#17621)
2022-02-22 20:14:17 +01:00
premailer_rails.rb
HTML e-mails for UserMailer (#6256)
2018-01-16 03:29:11 +01:00
rack_attack_logging.rb
Change rate limits for various paths (#14253)
2020-07-07 15:26:39 +02:00
rack_attack.rb
Fix error when trying to register (#17600)
2022-02-21 14:55:38 +01:00
redis.rb
Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)
2020-07-01 19:05:21 +02:00
session_activations.rb
Revocable sessions (#3616)
2017-06-23 18:50:53 +02:00
session_store.rb
Add Ruby 3.0 support (#16046)
2021-05-06 14:22:54 +02:00
sidekiq.rb
Fix warnings on Rails boot (#16946)
2021-12-27 00:47:20 +01:00
simple_form.rb
Fixed code quality issues (#15541)
2021-01-31 21:26:09 +01:00
single_user_mode.rb
Add single user mode
2016-12-06 17:19:26 +01:00
statsd.rb
Remove unused StatsD code and expose StatsD as a global variable (#11232)
2019-07-02 11:34:39 +02:00
stoplight.rb
Fix stoplight logging to stderr separate from Rails logger (#10624)
2019-04-23 04:39:48 +02:00
strong_migrations.rb
Fix migration failure due to StrongMigrations on production env (#5283)
2017-10-09 10:05:35 +02:00
suppress_csrf_warnings.rb
Fix autoloading deprecation warnings from Rails 6 (#16010)
2021-04-09 02:31:20 +02:00
trusted_proxies.rb
Fix error
2017-01-22 23:07:31 +01:00
twitter_regex.rb
Minor memory optimizations (#16507)
2021-10-14 21:04:57 +02:00
vapid.rb
Lint pass (#8876)
2018-10-04 12:36:53 +02:00
webauthn.rb
Add WebAuthn as an alternative 2FA method (#14466)
2020-08-24 16:46:27 +02:00
wrap_parameters.rb
Upgrade to Rails 5.0.0.1
2016-08-17 17:58:00 +02:00