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. |
||
|---|---|---|
| .. | ||
| accounts | ||
| admin | ||
| announcements | ||
| apps | ||
| domain_blocks | ||
| emails | ||
| featured_tags | ||
| instances | ||
| lists | ||
| notifications | ||
| peers | ||
| polls | ||
| push | ||
| statuses | ||
| timelines | ||
| trends | ||
| accounts_spec.rb | ||
| announcements_spec.rb | ||
| annual_reports_spec.rb | ||
| apps_spec.rb | ||
| blocks_spec.rb | ||
| bookmarks_spec.rb | ||
| conversations_spec.rb | ||
| csp_spec.rb | ||
| custom_emojis_spec.rb | ||
| directories_spec.rb | ||
| domain_blocks_spec.rb | ||
| endorsements_spec.rb | ||
| favourites_spec.rb | ||
| featured_tags_spec.rb | ||
| filters_spec.rb | ||
| follow_requests_spec.rb | ||
| followed_tags_spec.rb | ||
| instance_spec.rb | ||
| lists_spec.rb | ||
| markers_spec.rb | ||
| media_spec.rb | ||
| mutes_spec.rb | ||
| notifications_spec.rb | ||
| polls_spec.rb | ||
| preferences_spec.rb | ||
| profiles_spec.rb | ||
| reports_spec.rb | ||
| scheduled_status_spec.rb | ||
| statuses_spec.rb | ||
| streaming_spec.rb | ||
| suggestions_spec.rb | ||
| tags_spec.rb | ||