Commit Graph

11 Commits

Author SHA1 Message Date
Claire
f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
Yamagishi Kazutoshi
298491a816
Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00
Claire
aa832d623a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
2022-02-06 15:34:42 +01:00
potpro
097c4903f1
Update build-image.yml (#17454) 2022-02-05 17:29:54 +01:00
Claire
fec4ed5074 Revert "Change workflow to push to Docker Hub (#16980)"
This reverts commit 4b616c4f0a.
2021-12-18 12:47:57 +01:00
Shlee
c242c1d87a
Ruby 3.0.2 Upgrade (#16982)
* Update .ruby-version

* Update Gemfile

* Update Gemfile.lock

* Update Dockerfile

* Update check-i18n.yml

* Update config.yml

* Update config.yml
2021-11-18 21:59:57 +01:00
Eugen Rochko
f603de1f4c
Add manual GitHub Actions runs (#17000) 2021-11-16 21:42:14 +01:00
Eugen Rochko
4b616c4f0a
Change workflow to push to Docker Hub (#16980) 2021-11-14 06:11:05 +01:00
Yusuke Nakamura
e510302a7c
Build container image by GitHub Actions (#16973)
* Build container image by GitHub Actions

* Trigger docker build only pushed to main branch

* Tweak tagging imgae

- "edge" is the main branch
- "latest" is the tagged latest release
2021-11-12 05:18:29 +01:00
koyu
8be1ec13ae
Fix spelling error in i18n workflow (#16326) 2021-06-01 05:18:32 +02:00
Yamagishi Kazutoshi
1db28332b5
Add Actions for check i18n (#16285) 2021-05-22 15:00:20 +02:00