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.
Claire
3ef5f62abf
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream switched to pushing to both DockerHub and GitHub Container
Repository, while glitch-soc was already pushing to the latter only.
Updated our configuration to be slightly more consistent with upstream's
naming and styling, but kept our behavior.
- `Gemfile.lock`:
Updated dependencies textually too close to glitch-soc only hcaptcha
dependency.
Updated dependencies as upstream did.
- `README.md`:
Upstream updated its README, but we have a completely different one.
Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
Minor style fix upstream that's on a line glitch-soc removed because
of its different theming system.
Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
This file apparently did not exist upstream, upstream created it with
different contents but it is functionally the same.
Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
had its own code because it's a fork and does not have the same default
source URL.
Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
Upstream dependencies textually too close to a glitch-soc only one.
Updated dependencies as upstream did.
1 year ago
..
0_duplicate_migrations.rb
Fix ActiveRecord monkey-patching migration hack
3 years ago
0_post_deployment_migrations.rb
Add post-deployment migration system ( #8182 )
6 years ago
1_hosts.rb
Fix host check on healthcheck path not being disabled ( #16270 )
3 years ago
2_whitelist_mode.rb
Remove the terms blacklist and whitelist from UX ( #14149 )
4 years ago
active_model_serializers.rb
Fix ActivityPub context not being dynamically computed ( #11746 )
5 years ago
application_controller_renderer.rb
Update Mastodon to Rails 6.1 ( #15910 )
3 years ago
assets.rb
HTML e-mails for UserMailer ( #6256 )
6 years ago
backtrace_silencers.rb
Update Mastodon to Rails 6.1 ( #15910 )
3 years ago
blacklists.rb
Remove the terms blacklist and whitelist from UX ( #14149 )
4 years ago
cache_buster.rb
Add cache buster feature for media files ( #15155 )
4 years ago
cache_logging.rb
Add logging for Rails cache timeouts ( #21667 )
1 year ago
chewy.rb
Fix sidekiq jobs not triggering Elasticsearch index updates ( #24046 )
1 year ago
content_security_policy.rb
Add form-action CSP directive ( #20781 )
2 years ago
cookies_serializer.rb
Upgrade to Rails 5.0.0.1
8 years ago
cors.rb
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
devise.rb
Fix typos in source documentation ( #21046 )
1 year ago
doorkeeper.rb
Add missing admin scopes ( fix #20892 ) ( #20918 )
2 years ago
fast_blank.rb
Fixed code quality issues ( #15541 )
3 years ago
ffmpeg.rb
add ffmpeg initializer ( #8855 )
6 years ago
filter_parameter_logging.rb
Added optional two-factor authentication
7 years ago
http_client_proxy.rb
Support "http_hidden_proxy" ENV var for hidden service only proxy ( #18427 )
2 years ago
httplog.rb
Version bumps for ruby and misc gems ( #1159 )
7 years ago
inflections.rb
Add user content translations with configurable backends ( #19218 )
2 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 )
4 years ago
locale.rb
Actually fix config/locales-glitch not overriding translation strings ( #1872 )
2 years ago
mail_delivery_job.rb
Fix mailer jobs for deleted notifications erroring out ( #16294 )
3 years ago
makara.rb
Drop dependency on secure_headers, fix response headers ( #15712 )
3 years ago
mime_types.rb
Set correct content-type for ActivityPub JSON ( #4592 )
7 years ago
oj.rb
Remove rabl dependency ( #5894 )
7 years ago
omniauth.rb
Fix CAS_DISPLAY_NAME, SAML_DISPLAY_NAME and OIDC_DISPLAY_NAME being ignored ( #18568 )
2 years ago
open_uri_redirection.rb
Optimize some regex matching ( #15528 )
3 years ago
paperclip.rb
Added support for specifying S3 storage classes in environment ( #22480 )
1 year ago
permissions_policy.rb
Update Mastodon to Rails 6.1 ( #15910 )
3 years ago
pghero.rb
Fix PgHero suggesting migrations ( #17807 )
2 years ago
preload_link_headers.rb
Fix various typos ( #17621 )
2 years ago
premailer_rails.rb
HTML e-mails for UserMailer ( #6256 )
6 years ago
rack_attack.rb
Change rate limits to 1,500/5m per user, 300/5m per app ( #23347 )
1 year ago
rack_attack_logging.rb
Change rate limits for various paths ( #14253 )
4 years ago
redis.rb
Upgrade to latest redis-rb 4.x and fix deprecations ( #23616 )
1 year ago
session_activations.rb
Revocable sessions ( #3616 )
7 years ago
session_store.rb
Fix cookies secure flag being set when served over Tor ( #17992 )
2 years ago
sidekiq.rb
Fix vacuum scheduler missing lock, locks never expiring ( #19458 )
2 years ago
simple_form.rb
Add “Glitch-only” label to glitch-specific settings
2 years ago
single_user_mode.rb
Add single user mode
8 years ago
statsd.rb
Remove unused StatsD code and expose StatsD as a global variable ( #11232 )
5 years ago
stoplight.rb
Fix opening and closing Redis connections instead of using a pool ( #18171 )
2 years ago
strong_migrations.rb
Fix migration failure due to StrongMigrations on production env ( #5283 )
7 years ago
suppress_csrf_warnings.rb
Fix autoloading deprecation warnings from Rails 6 ( #16010 )
3 years ago
trusted_proxies.rb
Fix error
7 years ago
twitter_regex.rb
Refactor formatter ( #17828 )
2 years ago
vapid.rb
Lint pass ( #8876 )
6 years ago
webauthn.rb
Add WebAuthn as an alternative 2FA method ( #14466 )
4 years ago
wrap_parameters.rb
Upgrade to Rails 5.0.0.1
8 years ago