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 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)		5 years ago
..
_action_log.html.haml	Improve report layout (#7188)	7 years ago
_status.html.haml	Add soft delete for statuses for instant deletes through API (#11623)	5 years ago
index.html.haml	Fix display of instance actor in reports UI (#11798)	5 years ago
show.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago