a5127d0ef8
Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did. |
||
|---|---|---|
| .. | ||
| exports | ||
| migration | ||
| preferences | ||
| two_factor_authentication | ||
| aliases_controller_spec.rb | ||
| applications_controller_spec.rb | ||
| deletes_controller_spec.rb | ||
| exports_controller_spec.rb | ||
| featured_tags_controller_spec.rb | ||
| flavours_controller_spec.rb | ||
| imports_controller_spec.rb | ||
| login_activities_controller_spec.rb | ||
| migrations_controller_spec.rb | ||
| pictures_controller_spec.rb | ||
| privacy_controller_spec.rb | ||
| profiles_controller_spec.rb | ||
| sessions_controller_spec.rb | ||
| two_factor_authentication_methods_controller_spec.rb | ||
| verifications_controller_spec.rb | ||