07eb31eeac
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
6 years ago
51e154f5e8
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
6 years ago
71d683b410
Change instance_presenter_spec to point to glitch-soc instead of tootsuite
6 years ago
1bc78ec50e
Add specs for InstancePresenter ( #9596 )
6 years ago
9b8a448477
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.
7 years ago
76fa9d2488
Use around hook to restore context in InstancePresenter spec ( #3430 )
8 years ago
3b8908c114
About page contact email ( #1839 )
...
* Correct site_contact_email typo
* Separate about more page into partials, add specs
8 years ago
e5282e4ec0
Clean up about page ( #1282 )
...
* Add InstancePresenter to expose site details
* Clean up about controller, use instance presenter
8 years ago
Thibaut Girka
Eugen Rochko
ysksn
Akihiko Odaki
Matt Jankowski