741766a01d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
2019-03-14 17:17:20 +01:00
73fb7bfa0f
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
2019-03-14 05:28:30 +01:00
56d4c731f1
Change instance_presenter_spec to point to glitch-soc instead of tootsuite
2018-12-23 11:45:26 +01:00
25fffd5fcb
Add specs for InstancePresenter ( #9596 )
2018-12-21 08:59:56 +01:00
ca6c8b92d9
Isolate each specs for cache store ( #6450 )
...
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.
2018-02-17 22:35:05 +01:00
27811b2b39
Use around hook to restore context in InstancePresenter spec ( #3430 )
2017-05-30 09:03:35 -04:00
f382a4f746
About page contact email ( #1839 )
...
* Correct site_contact_email typo
* Separate about more page into partials, add specs
2017-04-15 13:33:25 +02:00
41b79ae693
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
2017-04-09 14:47:25 +02:00
Thibaut Girka