forked from treehouse/mastodon
221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings. |
||
---|---|---|
.. | ||
importer | ||
push_notifications | ||
account_notes.js | ||
accounts.js | ||
alerts.js | ||
announcements.js | ||
app.js | ||
blocks.js | ||
bookmarks.js | ||
boosts.js | ||
bundles.js | ||
columns.js | ||
compose.js | ||
conversations.js | ||
custom_emojis.js | ||
directory.js | ||
domain_blocks.js | ||
dropdown_menu.js | ||
emojis.js | ||
favourites.js | ||
filters.js | ||
height_cache.js | ||
history.js | ||
interactions.js | ||
languages.js | ||
lists.js | ||
markers.js | ||
modal.js | ||
mutes.js | ||
notifications.js | ||
onboarding.js | ||
picture_in_picture.js | ||
pin_statuses.js | ||
polls.js | ||
reports.js | ||
rules.js | ||
search.js | ||
settings.js | ||
statuses.js | ||
store.js | ||
streaming.js | ||
suggestions.js | ||
tags.js | ||
timelines.js | ||
trends.js |