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
..
assets.rake	Override current_user when generating static pages	6 years ago
auto_annotate_models.rake	…
db.rake	Fix low-hanging rubocop gripes (#8458)	6 years ago
emojis.rake	Update emoji codepoint mappings to v11.0 (#9618)	6 years ago
glitchsoc.rake	…
mastodon.rake	Add tootctl settings registrations open (#8829)	6 years ago
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	5 years ago
statistics.rake	…