155dc4bc4b
Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly. |
||
|---|---|---|
| .. | ||
| 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 | ||