mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2022-10-09	Add server banner to web app, add `GET /api/v2/instance` to REST API (#19294)	Eugen Rochko
	Cherry-picked d2528b26b6da34f34b5d7a392e263428d3c09d69 Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream changed stuff, we had extra attributes. Applied upstream changes while keeping our extra attributes. - `app/serializers/rest/instance_serializer.rb`: Upstream actually moved that to `app/serializers/rest/v1/instance_serializer.rb`, so updated that file by keeping our extra attributes, and took upstream's version of `app/serializers/rest/instance_serializer.rb`. - `spec/views/about/show.html.haml_spec.rb`: Took upstream's version.
2019-03-14	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14	Admission-based registrations mode (#10250)	Eugen Rochko
	Fix #6856 Fix #6951
2018-12-23	Change instance_presenter_spec to point to glitch-soc instead of tootsuite	Thibaut Girka

2018-12-21	Add specs for InstancePresenter (#9596)	ysksn

2018-02-17	Isolate each specs for cache store (#6450)	Akihiko Odaki
	The cache store is explicitly used by some specs, but they were not isolated and therefore not reliable. This fixes the issue by clearing the cache after each specs.
2017-05-30	Use around hook to restore context in InstancePresenter spec (#3430)	Akihiko Odaki

2017-04-15	About page contact email (#1839)	Matt Jankowski
	* Correct site_contact_email typo * Separate about more page into partials, add specs
2017-04-09	Clean up about page (#1282)	Matt Jankowski
	* Add InstancePresenter to expose site details * Clean up about controller, use instance presenter