Thibaut Girka 2e38d889a3 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)		2019-09-13 18:13:43 +02:00
..
assets.rake	Override current_user when generating static pages	2018-12-19 20:49:58 +01:00
auto_annotate_models.rake	Improve RuboCop rules (compatibility to Code Climate) (#3636)	2017-06-08 13:24:28 +02:00
db.rake	Fix low-hanging rubocop gripes (#8458)	2018-08-26 19:22:46 +02:00
emojis.rake	Update emoji codepoint mappings to v11.0 (#9618)	2018-12-24 19:12:00 +01:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Add tootctl settings registrations open (#8829)	2018-10-04 16:05:54 +02:00
repo.rake	Add missing locale file for ga and add rake task to check for it (#11813)	2019-09-12 04:58:33 +02:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00