d8b0a732aa
Conflicts: - `config/initializers/simple_form.rb`: Upstream added a new simple_form component, where we had an extra one. Kept both components. |
||
|---|---|---|
| .. | ||
| chewy | ||
| config/initializers | ||
| controllers | ||
| fabricators | ||
| features | ||
| fixtures | ||
| generators | ||
| helpers | ||
| lib | ||
| locales | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| requests | ||
| routing | ||
| serializers | ||
| services | ||
| support | ||
| validators | ||
| views/statuses | ||
| workers | ||
| fabricators_spec.rb | ||
| rails_helper.rb | ||
| spec_helper.rb | ||