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. |
||
|---|---|---|
| .. | ||
| admin | ||
| 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 | ||