0cec9077a4
Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value. |
||
---|---|---|
.. | ||
chewy | ||
config/initializers/rack | ||
controllers | ||
fabrication | ||
fabricators | ||
fixtures | ||
generators | ||
helpers | ||
lib | ||
locales | ||
mailers | ||
models | ||
policies | ||
presenters | ||
requests | ||
routing | ||
search/models/concerns/account | ||
serializers | ||
services | ||
support | ||
system | ||
validators | ||
views | ||
workers | ||
flatware_helper.rb | ||
rails_helper.rb | ||
spec_helper.rb |