diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-15 09:08:12 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-03-15 09:16:10 +0100 |
commit | 3ef5f62abfc65085604265cfa2559b4d9ae98ace (patch) | |
tree | f51b8ba1e646edd2c527dbeb22f640a3610effc4 /app/views/well_known/host_meta | |
parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
parent | 75131e7bf7f3d96cf325e674e6b76b0096382e99 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
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.
Diffstat (limited to 'app/views/well_known/host_meta')
0 files changed, 0 insertions, 0 deletions