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. |
||
---|---|---|
.. | ||
actions | ||
components | ||
containers | ||
features | ||
locales | ||
middleware | ||
reducers | ||
selectors | ||
service_worker | ||
store | ||
utils | ||
api.js | ||
base_polyfills.js | ||
blurhash.js | ||
common.js | ||
compare_id.js | ||
extra_polyfills.js | ||
initial_state.js | ||
is_mobile.js | ||
load_keyboard_extensions.js | ||
load_polyfills.js | ||
main.jsx | ||
performance.js | ||
permissions.js | ||
ready.js | ||
scroll.js | ||
settings.js | ||
stream.js | ||
test_setup.js | ||
uuid.js |