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 74c5b2bd08 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - app/controllers/api/v1/search_controller.rb Conflict because we changed the number of default results to be configurable - app/lib/settings/scoped_settings.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme) - spec/controllers/application_controller_spec.rb Addition of a new “noindex” site-wide setting, conflict due to our change of the two other site-wide settings (default flavour and skin instead of theme)		5 years ago
..
account_batch.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
admin_settings.rb	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
custom_emoji_batch.rb	Add batch actions and categories to admin UI for custom emojis (#11793)	5 years ago
delete_confirmation.rb	…
migration.rb	Rename ResolveRemoteAccountService to ResolveAccountService (#6327)	7 years ago
status_batch.rb	Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)	5 years ago
tag_batch.rb	Add batch approve/reject for pending hashtags in admin UI (#11791)	5 years ago
two_factor_confirmation.rb	…