izaliamae/glitch-soc
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
glitch-soc/.github/workflows
History
Claire 6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05 14:16:25 +01:00
..
build-image.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-12-15 20:25:25 +01:00
check-i18n.yml See version file in GitHub Actions (#21927) 2022-12-07 00:30:59 +01:00
codeql.yml Run Prettier on YML files (#22345) 2022-12-16 11:11:52 +09:00
lint-json.yml Move Prettier CI checks to filtered jobs (#22376) 2023-01-05 13:45:21 +01:00
lint-yml.yml Move Prettier CI checks to filtered jobs (#22376) 2023-01-05 13:45:21 +01:00
linter.yml Move Prettier CI checks to filtered jobs (#22376) 2023-01-05 13:45:21 +01:00
rebase-needed.yml Add CI job to label PRs with merge conflicts (#22020) 2022-12-09 06:37:13 +01:00