luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-18 21:03:27 +00:00
Code Issues Projects Releases Wiki Activity
14692 commits 1 branch 0 tags 248 MiB
Commit graph

6 commits

Author SHA1 Message Date
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
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