mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2025-01-19 07:14:05 +01:00
0aa69487a2
Conflicts: - `app/models/concerns/user/has_settings.rb`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `app/views/settings/preferences/appearance/show.html.haml`: Not a real conflict, upstream added a setting textually close to a glitch-soc one. Added upstream's new setting. - `config/routes.rb`: Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had an extra route. Moved the extra route to `config/routes/web_app.rb`. - `spec/controllers/settings/preferences/appearance_controller_spec.rb`: This spec got converted to a system spec upstream. However, the theme setting works differently in glitch-soc, so the spec had been changed. Changed the corresponding system spec as well. |
||
|---|---|---|
| .. | ||
| disallowed_hashtags_validator.rb | ||
| domain_validator.rb | ||
| email_address_validator.rb | ||
| email_mx_validator.rb | ||
| existing_username_validator.rb | ||
| follow_limit_validator.rb | ||
| language_validator.rb | ||
| lines_validator.rb | ||
| note_length_validator.rb | ||
| poll_validator.rb | ||
| reaction_validator.rb | ||
| registration_form_time_validator.rb | ||
| status_length_validator.rb | ||
| status_pin_validator.rb | ||
| unique_username_validator.rb | ||
| unreserved_username_validator.rb | ||
| url_validator.rb | ||
| user_email_validator.rb | ||
| vote_validator.rb | ||
| web_push_key_validator.rb | ||