You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
5ac380c122
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream. |
1 year ago | |
---|---|---|
.. | ||
chewy | 1 year ago | |
config/initializers | 1 year ago | |
controllers | 1 year ago | |
fabricators | 1 year ago | |
features | 1 year ago | |
fixtures | 1 year ago | |
helpers | 1 year ago | |
lib | 1 year ago | |
mailers | 1 year ago | |
models | 1 year ago | |
policies | 1 year ago | |
presenters | 1 year ago | |
requests | 1 year ago | |
routing | 1 year ago | |
serializers | 1 year ago | |
services | 1 year ago | |
support | 1 year ago | |
validators | 1 year ago | |
views/statuses | 2 years ago | |
workers | 1 year ago | |
fabricators_spec.rb | 1 year ago | |
rails_helper.rb | 1 year ago | |
spec_helper.rb | 1 year ago |