mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 09:07:01 +00:00
3ef5f62abf
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| admin | ||
| api | ||
| auth | ||
| concerns | ||
| disputes | ||
| filters | ||
| oauth | ||
| settings | ||
| well_known | ||
| about_controller.rb | ||
| accounts_controller.rb | ||
| application_controller.rb | ||
| authorize_interactions_controller.rb | ||
| custom_css_controller.rb | ||
| emojis_controller.rb | ||
| filters_controller.rb | ||
| follower_accounts_controller.rb | ||
| following_accounts_controller.rb | ||
| health_controller.rb | ||
| home_controller.rb | ||
| instance_actors_controller.rb | ||
| intents_controller.rb | ||
| invites_controller.rb | ||
| manifests_controller.rb | ||
| media_controller.rb | ||
| media_proxy_controller.rb | ||
| privacy_controller.rb | ||
| relationships_controller.rb | ||
| shares_controller.rb | ||
| statuses_cleanup_controller.rb | ||
| statuses_controller.rb | ||
| tags_controller.rb | ||