ab152ebed4
Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
|---|---|---|
| .. | ||
| admin | ||
| disputes | ||
| settings | ||
| about_spec.rb | ||
| captcha_spec.rb | ||
| filters_spec.rb | ||
| home_spec.rb | ||
| invites_spec.rb | ||
| log_in_spec.rb | ||
| log_out_spec.rb | ||
| media_spec.rb | ||
| new_statuses_spec.rb | ||
| oauth_spec.rb | ||
| ocr_spec.rb | ||
| privacy_spec.rb | ||
| profile_spec.rb | ||
| redirections_spec.rb | ||
| report_interface_spec.rb | ||
| severed_relationships_spec.rb | ||
| share_entrypoint_spec.rb | ||
| statuses_cleanup_spec.rb | ||
| tags_spec.rb | ||
| terms_of_service_spec.rb | ||
| unlogged_spec.rb | ||