077e0c6812
Conflicts: - `Gemfile.lock`: Conflict caused by the `json` gem thing once again. Updated as upstream did, but keeping the most recent `json` version. - `spec/helpers/application_helper_spec.rb`: Upstream refactored a bunch of specs, including one place that differs because of glitch-soc's theming system. Refactored as upstream did, adapting it for glitch-soc's theming system. |
||
|---|---|---|
| .. | ||
| 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 | ||