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
..
v1	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
v2	Add more granular OAuth scopes (#7929)	6 years ago
web	Lint pass (#8876)	6 years ago
base_controller_spec.rb	Change unconfirmed user login behaviour (#11375)	5 years ago
oembed_controller_spec.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	5 years ago
proofs_controller_spec.rb	Add Keybase integration (#10297)	6 years ago