You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka ec49aa8175 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, we deleted it to not be flooded by Depandabot. Kept deleted. - `Gemfile.lock`: Puma updated on both sides, went for the most recent version. - `app/controllers/api/v1/mutes_controller.rb`: Upstream updated the serializer to support timed mutes, while glitch-soc added a custom API ages ago to get information that is already available elsewhere. Dropped the glitch-soc-specific API, went with upstream changes. - `app/javascript/core/admin.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/javascript/packs/public.js`: Conflict due to changing how assets are loaded. Went with upstream. - `app/models/mute.rb`: 🤷 - `app/models/user.rb`: New user setting added upstream while we have glitch-soc-specific user settings. Added upstream's user setting. - `config/settings.yml`: Upstream added a new user setting close to a user setting we had changed the defaults for. Added the new upstream setting. - `package.json`: Upstream dependency updated “too close” to a glitch-soc-specific dependency. No real conflict. Updated the dependency.		4 years ago
..
0_duplicate_migrations.rb	Fix ActiveRecord::Migration.check_pending! failing because of duplicate migrations	5 years ago
0_post_deployment_migrations.rb	…
1_hosts.rb	…
2_whitelist_mode.rb	Remove the terms blacklist and whitelist from UX (#14149)	5 years ago
active_model_serializers.rb	…
application_controller_renderer.rb	…
assets.rb	…
backtrace_silencers.rb	…
blacklists.rb	Remove the terms blacklist and whitelist from UX (#14149)	5 years ago
chewy.rb	Fix workaround for Elasticsearch 7.x (#13828)	5 years ago
content_security_policy.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
cookies_serializer.rb	…
cors.rb	…
delivery_job.rb	…
devise.rb	✨ Add an LDAP Mail attribute config (#12053)	5 years ago
doorkeeper.rb	Add E2EE API (#13820)	5 years ago
fast_blank.rb	…
ffmpeg.rb	…
filter_parameter_logging.rb	…
health_check.rb	…
http_client_proxy.rb	Refactor monkey-patching of Goldfinger (#12561)	5 years ago
httplog.rb	…
inflections.rb	Add E2EE API (#13820)	5 years ago
json_ld.rb	Fix preloaded JSON-LD context for identity not being used (#12138)	5 years ago
kaminari_config.rb	Add ability to filter audit log in admin UI (#13381)	5 years ago
locale.rb	Move glitch-specific ruby-side locales to their own files	5 years ago
mime_types.rb	…
oj.rb	…
omniauth.rb	…
open_uri_redirection.rb	…
pagination.rb	…
paperclip.rb	add S3_READ_TIMEOUT environment variable (#14952)	4 years ago
premailer_rails.rb	…
rack_attack.rb	Add IP-based rules (#14963)	4 years ago
rack_attack_logging.rb	Change rate limits for various paths (#14253)	4 years ago
redis.rb	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	4 years ago
session_activations.rb	…
session_store.rb	…
sidekiq.rb	Fix background jobs not using locks like they are supposed to (#13361)	5 years ago
simple_form.rb	Add announcements (#12662)	5 years ago
single_user_mode.rb	…
statsd.rb	…
stoplight.rb	…
strong_migrations.rb	…
suppress_csrf_warnings.rb	…
trusted_proxies.rb	…
twitter_regex.rb	Add support for Gemini urls (#15013)	4 years ago
vapid.rb	…
webauthn.rb	Add WebAuthn as an alternative 2FA method (#14466)	4 years ago
wrap_parameters.rb	…