mastodon-glitch/config/initializers
Thibaut Girka a22e6a3683 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/statuses_controller.rb`:
  Upstream disabled the embed controller for reblogs.
  Not a real conflict, but glitch-soc has an extra line to deal
  with its theming system.
  Ported upstream changes.
- `app/javascript/packs/public.js`:
  Upstream made changes to get rid of most inline CSS, this changes
  javascript for public pages, which in glitch are split between
  different files. Ported those changes.
- `app/models/status.rb`:
  Upstream changed the block check in `Status#permitted_for` to
  include domain-block checks. Not a real conflict with glitch-soc,
  but our scope is slightly different, as our scope for
  unauthenticated access do not include instance-local toots.
  Ported upstream changes.
- `app/serializers/rest/instance_serializer.rb`:
  Not a real conflict, upstream added a new field to the instance
  serializer, the conflict is one line above since we added more of
  that.
  Ported upstream changes.
- `app/views/settings/profiles/show.html.haml`:
  Upstream got rid of most inline CSS and moved hidden elements
  to data attributes in the process, in fields were we have
  different values.
  Ported upstream changes while keeping our glitch-specific
  values.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream got rid of inline CSS on an HAML line we treat
  differently, stripping empty text nodes.
  Ported upstream changes to the style attribute, keeping
  the empty text node stripping behavior.
2020-05-03 21:23:49 +02:00
..
0_duplicate_migrations.rb Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations 2020-02-10 20:04:41 +01:00
0_post_deployment_migrations.rb Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
1_hosts.rb Set Content-Security-Policy rules through RoR's config (#8957) 2018-10-11 20:35:46 +02:00
2_whitelist_mode.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +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
assets.rb
backtrace_silencers.rb
blacklists.rb
chewy.rb Fix search not working due to proxy settings when using hidden services (#13488) 2020-04-17 15:14:24 +02:00
content_security_policy.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
cookies_serializer.rb
cors.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-12-15 10:45:53 +01:00
delivery_job.rb Skip mailer job retries when a record no longer exists (#9590) 2018-12-21 06:16:17 +01:00
devise.rb Add an LDAP Mail attribute config (#12053) 2019-12-01 18:52:21 +01:00
doorkeeper.rb Fix resource_owner_from_credentials in Doorkeeper initializer (#12743) 2020-01-03 05:35:46 +01:00
fast_blank.rb
ffmpeg.rb add ffmpeg initializer (#8855) 2018-10-09 03:02:52 +02:00
filter_parameter_logging.rb
health_check.rb Hide error message on /heath (#11947) 2019-09-24 20:28:25 +02:00
http_client_proxy.rb lint pass 2 (#8878) 2018-10-04 17:38:04 +02:00
httplog.rb
inflections.rb Add a nodeinfo endpoint (#12002) 2019-09-29 21:31:51 +02: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
mime_types.rb
oj.rb
omniauth.rb cas_options :validate_url should be :service_validate_url (#10328) 2019-03-21 04:06:41 +01:00
open_uri_redirection.rb rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
pagination.rb
paperclip.rb Fix naming issue (#13551) 2020-04-27 10:32:05 +02:00
premailer_rails.rb
rack_attack.rb Fix re-sending of e-mail confirmation not being rate limited (#13360) 2020-03-31 18:20:48 +02:00
rack_attack_logging.rb Bump rack-attack from 5.4.2 to 6.0.0 (#10599) 2019-05-03 16:16:11 +02:00
redis.rb
session_activations.rb
session_store.rb Disable Same-Site cookie implementation to fix SSO issues on WebKit browsers (#9819) 2019-01-15 23:11:46 +01:00
sidekiq.rb Fix background jobs not using locks like they are supposed to (#13361) 2020-03-31 21:59:03 +02:00
simple_form.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
single_user_mode.rb
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
suppress_csrf_warnings.rb
trusted_proxies.rb
twitter_regex.rb Add support for magnet: URIs (#12905) 2020-01-23 21:27:26 +01:00
vapid.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
wrap_parameters.rb