mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2025-01-19 15:24: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. |
||
|---|---|---|
| .. | ||
| admin | ||
| accounts_helper.rb | ||
| application_helper.rb | ||
| authorized_fetch_helper.rb | ||
| branding_helper.rb | ||
| context_helper.rb | ||
| database_helper.rb | ||
| domain_control_helper.rb | ||
| email_helper.rb | ||
| filters_helper.rb | ||
| flashes_helper.rb | ||
| formatting_helper.rb | ||
| home_helper.rb | ||
| instance_helper.rb | ||
| invites_helper.rb | ||
| jsonld_helper.rb | ||
| languages_helper.rb | ||
| media_component_helper.rb | ||
| react_component_helper.rb | ||
| registration_helper.rb | ||
| routing_helper.rb | ||
| self_destruct_helper.rb | ||
| settings_helper.rb | ||
| statuses_helper.rb | ||
| theme_helper.rb | ||