glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Claire	490417762f	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/workflows/build-image.yml`: Fix erroneous deletion in a previous merge. - `Gemfile`: Conflict caused by glitch-soc-only hCaptcha dependency - `app/controllers/auth/sessions_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/controllers/filters_controller.rb`: Minor conflict due to glitch-soc's theming system. - `app/serializers/rest/status_serializer.rb`: Minor conflict due to glitch-soc having an extra `local_only` property	2 years ago
dependabot[bot]	6aed559bb5	Bump docker/setup-buildx-action from 1 to 2 (#18677 ) Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	dc250cb7f3	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Changed upstream, while we modified it in glitch-soc to not get spammed by dependabot. Kept it removed. - `README.md`: Changed upstream, which has a very different version. Discarded upstream changes.	2 years ago
dependabot[bot]	f0509b8ce6	Bump docker/login-action from 1 to 2 (#18678 ) Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	7d4125f306	Bump docker/setup-qemu-action from 1 to 2 (#18676 ) Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 1 to 2. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	2c1ec2d369	Bump docker/build-push-action from 2 to 3 (#18675 ) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	64d8c68244	Bump docker/metadata-action from 3 to 4 (#18674 ) Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4. - [Release notes](https://github.com/docker/metadata-action/releases) - [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md) - [Commits](https://github.com/docker/metadata-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/metadata-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
dependabot[bot]	5ae488867b	Bump actions/checkout from 2 to 3 (#18679 ) Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2 years ago
Claire	a578b95f7a	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Eugen Rochko	36d5cefeb6	Revert "Split build image actions (#17793 )" (#17907 ) This reverts commit `4eef881f84`.	3 years ago
Claire	bdaf4179b3	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Shlee	4eef881f84	Split build image actions (#17793 ) * Update build-image.yml * Update build-image.yml * Update build-image.yml * Update build-image.yml	3 years ago
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.	3 years ago
Yamagishi Kazutoshi	f0e4809502	Format JSON and YAML using Prettier (#17823 ) * Format JSON and YAML using Prettier * Add prettier to devDep	3 years ago
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.	3 years ago
Yamagishi Kazutoshi	e248509de9	Replace metadata-action type to match (#17802 )	3 years ago
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.	3 years ago
Yamagishi Kazutoshi	a196b578f0	Skip Docker Hub login for pull requests (#17625 ) * Skip Docker Hub login for pull requests * Add support pr tag	3 years ago
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.	3 years ago
Yamagishi Kazutoshi	a40e6f5d97	Remove protobuf dependencies (#17539 )	3 years ago
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.	3 years ago
potpro	3050472467	Update build-image.yml (#17454 )	3 years ago
Claire	b3d1cf4cfe	Revert "Change workflow to push to Docker Hub (#16980 )" This reverts commit `fc187cefdf`.	3 years ago
Eugen Rochko	c32e5f820d	Add manual GitHub Actions runs (#17000 )	3 years ago
Eugen Rochko	fc187cefdf	Change workflow to push to Docker Hub (#16980 )	3 years ago
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	3 years ago

26 Commits (b682c11a6e27a1773715adfdea55f3098925a935)