016d194274
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, upstream added helpers right next to glitch-soc only helpers. Added upstream's helpers. - `spec/models/status_spec.rb`: Not a real conflict, upstream added specs right next to glitch-soc only specs. Added upstream's tests. |
||
|---|---|---|
| .. | ||
| chewy | ||
| config/initializers/rack | ||
| controllers | ||
| fabrication | ||
| fabricators | ||
| features | ||
| fixtures | ||
| generators | ||
| helpers | ||
| lib | ||
| locales | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| requests | ||
| routing | ||
| search/models/concerns/account | ||
| serializers | ||
| services | ||
| support | ||
| system | ||
| validators | ||
| views | ||
| workers | ||
| rails_helper.rb | ||
| spec_helper.rb | ||