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 | |
---|---|---|
.. | ||
active_record | 1 year ago | |
assets | 1 year ago | |
chewy/strategy | 2 years ago | |
devise | 5 years ago | |
generators | 6 years ago | |
json_ld | 3 years ago | |
mastodon | 1 year ago | |
paperclip | 1 year ago | |
rails | 1 year ago | |
redis | 4 years ago | |
sanitize_ext | 1 year ago | |
simple_navigation | 2 years ago | |
tasks | 1 year ago | |
templates | 6 years ago | |
terrapin | 3 years ago | |
webpacker | 4 years ago | |
cli.rb | 1 year ago | |
exceptions.rb | 2 years ago | |
public_file_server_middleware.rb | 1 year ago |