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.
2022-06-21 08:28:59 +02:00
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>
2022-06-20 18:52:36 +09:00
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>
2022-06-20 18:52:12 +09:00
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>
2022-06-19 14:40:46 +09:00
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>
2022-06-19 14:39:21 +09:00
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>
2022-06-19 14:38:07 +09:00
eaf3df43e9
Set-up Problem Matchers ( #18598 )
2022-06-16 22:09:43 +02:00
a864904fad
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/montserrat.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto-mono.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/javascript/styles/fonts/roboto.scss`:
Code style changes upstream, path changes in glitch-soc.
Applied upstream's code style changes.
- `app/models/account.rb`:
Textual conflict only caused by glitch-soc using a different value
for character limits in a nearby line.
Applied upstream's changes.
- `app/views/statuses/_simple_status.html.haml`:
Attribute added to a tag modified by glitch-soc.
Added upstream's attributes.
- `yarn.lock`:
Upstream added/updated dependencies close to glitch-soc-only ones.
Updated/added upstream dependencies.
2022-06-02 09:49:38 +02:00
848648e058
Replace from Code Climate to Super-Linter ( #18587 )
2022-06-01 19:22:35 +02:00
a578b95f7a
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-30 15:02:56 +02:00
36d5cefeb6
Revert "Split build image actions ( #17793 )" ( #17907 )
...
This reverts commit 4eef881f84
2022-03-30 14:34:53 +02:00
bdaf4179b3
Merge branch 'main' into glitch-soc/merge-upstream
2022-03-30 13:40:10 +02:00
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
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
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
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
e248509de9
Replace metadata-action type to match ( #17802 )
2022-03-15 20:38:29 +01:00
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
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
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
a40e6f5d97
Remove protobuf dependencies ( #17539 )
2022-02-14 16:08:02 +01:00
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
3050472467
Update build-image.yml ( #17454 )
2022-02-05 17:29:54 +01:00
b3d1cf4cfe
Revert "Change workflow to push to Docker Hub ( #16980 )"
...
This reverts commit fc187cefdf
2021-12-18 12:47:57 +01:00
0e747afd34
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
c32e5f820d
Add manual GitHub Actions runs ( #17000 )
2021-11-16 21:42:14 +01:00
fc187cefdf
Change workflow to push to Docker Hub ( #16980 )
2021-11-14 06:11:05 +01:00
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
74fe222523
Fix spelling error in i18n workflow ( #16326 )
2021-06-01 05:18:32 +02:00
0f92d335a2
Add Actions for check i18n ( #16285 )
2021-05-22 15:00:20 +02:00
Claire