treehouse
/
mastodon
20
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
15,308 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18 Commits (6256a3da46b33312e09e8fbc5d7a64c0ba1662a1)

Author SHA1 Message Date
Claire a578b95f7a Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 15:02:56 +02:00
Eugen Rochko 36d5cefeb6 Revert "Split build image actions (#17793)" (#17907) 
This reverts commit 4eef881f84.
 2022-03-30 14:34:53 +02:00
Claire bdaf4179b3 Merge branch 'main' into glitch-soc/merge-upstream 2022-03-30 13:40:10 +02:00
Shlee 4eef881f84 Split build image actions (#17793) 
* Update build-image.yml

* Update build-image.yml

* Update build-image.yml

* Update build-image.yml
 2022-03-28 23:38:20 +02:00
Claire f56a3dc4e2 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
 2022-03-22 17:00:38 +01:00
Yamagishi Kazutoshi f0e4809502 Format JSON and YAML using Prettier (#17823) 
* Format JSON and YAML using Prettier

* Add prettier to devDep
 2022-03-21 04:46:11 +01:00
Claire 24c1b04f9c Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our README.
 2022-03-15 20:45:27 +01:00
Yamagishi Kazutoshi e248509de9 Replace metadata-action type to match (#17802) 2022-03-15 20:38:29 +01:00
Claire c58e2f4775 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed the workflow a bit.
  Conflict comes from us pushing to ghcr while upstream pushes to dockerhub.
  Ported the upstream changes while still pushing to ghcr.
 2022-02-23 18:13:12 +01:00
Yamagishi Kazutoshi a196b578f0 Skip Docker Hub login for pull requests (#17625) 
* Skip Docker Hub login for pull requests

* Add support pr tag
 2022-02-23 16:44:16 +01:00
Claire 175446f293 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 a40e6f5d97 Remove protobuf dependencies (#17539) 2022-02-14 16:08:02 +01:00
Claire aaace9f1db 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 3050472467 Update build-image.yml (#17454) 2022-02-05 17:29:54 +01:00
Claire b3d1cf4cfe Revert "Change workflow to push to Docker Hub (#16980)" 
This reverts commit fc187cefdf.
 2021-12-18 12:47:57 +01:00
Eugen Rochko c32e5f820d Add manual GitHub Actions runs (#17000) 2021-11-16 21:42:14 +01:00
Eugen Rochko fc187cefdf Change workflow to push to Docker Hub (#16980) 2021-11-14 06:11:05 +01:00
Yusuke Nakamura 786e5e634c 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