about summary refs log tree commit diff
path: root/.github/workflows
AgeCommit message (Collapse)Author
2023-02-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.
2023-02-20Update rebase needed job settings (#23746)Nick Schonning
2023-02-20Fix Markdown files with Prettier and check in CI (#21972)Nick Schonning
2023-02-20Rename JSX files with proper `.jsx` extension (#23733)Renaud Chaput
2023-02-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
2023-02-19Move db migration CI to GitHub Actions (#23624)Nick Schonning
2023-02-18Run bundler-audit on PRs (#23514)Nick Schonning
2023-02-18Check for missing i18n strings in CI (#23368)Nick Schonning
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-02-18Set CI concurrency at the job level (#23689)Nick Schonning
2023-02-18Only run latest for PR Rebase job (#23688)Nick Schonning
2023-02-16Generate minimimal Rubocop Todo file (#23629)Nick Schonning
2023-02-16Trigger CI build on .nvmrc change (#23627)Nick Schonning
2023-02-16Use .nvmrc file for CI setup-node (#23562)Nick Schonning
2023-02-16Move Jest tests to filtered GitHub Action (#23623)Nick Schonning
2023-02-15Upgrade to Ruby 3.2 (#22928)Aaron Patterson
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2023-02-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-09Cleanup unused i18n strings (#23426)Nick Schonning
* Remove partial 422/500 error translations * Add missing siblings for i18n unused warnings * Enable i18n unused string checking for all locales
2023-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.
2023-02-01Skip locales linting (#23352)Yamagishi Kazutoshi
2023-02-01Fix official docker images nto being compatible with some cloud providers ↵Claire
(#23354) See #23333 and https://github.com/docker/buildx/issues/1533
2023-02-01Bump docker/build-push-action from 3 to 4 (#23333)dependabot[bot]
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v3...v4) --- 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>
2023-01-30Only build latest commit on branch for image (#23306)Nick Schonning
2023-01-30Filter Superlinter to Ruby files only (#21976)Nick Schonning
2023-01-30Separate Stylelint from Superlinter (#23303)Nick Schonning
2023-01-29Separate ESLint CI from Superlinter (#23029)Nick Schonning
* Separate ESLint CI from Superlinter * Correct JS indenting level * Remove extra semicolons with ESLint autofix
2023-01-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-24Bump hadolint/hadolint-action from 3.0.0 to 3.1.0 (#23234)dependabot[bot]
Bumps [hadolint/hadolint-action](https://github.com/hadolint/hadolint-action) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/hadolint/hadolint-action/releases) - [Changelog](https://github.com/hadolint/hadolint-action/blob/master/.releaserc) - [Commits](https://github.com/hadolint/hadolint-action/compare/v3.0.0...v3.1.0) --- updated-dependencies: - dependency-name: hadolint/hadolint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream updated its README, while we have a completely different one. Kept our README. - `app/controllers/concerns/web_app_controller_concern.rb`: Conflict because of glitch-soc's theming system. Additionally, glitch-soc has different behavior regarding moved accounts. Ported some of the changes, but kept our overall behavior. - `app/javascript/packs/admin.js`: Code changes actually applied to `app/javascript/core/admin.js`
2023-01-05Move Prettier CI checks to filtered jobs (#22376)Nick Schonning
2022-12-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-12-16Run Prettier on YML files (#22345)Nick Schonning
2022-12-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring
2022-12-15Add hadolint as Dockerfile linter (#20993)Moritz Heiber
* Added hadolint as Dockerfile linter in pipeline and resolved remaining hadolint issues in Dockerfile * Use more specific version of hadolint Action * Bumpt hadolint Action version to latest version to avoid deprecation notice * Being _really_ specific now
2022-12-15Add CodeQL workflow (#21894)Justin Hutchings
2022-12-09Merge branch 'main' into glitch-soc/mainClaire
2022-12-09Add CI job to label PRs with merge conflicts (#22020)Nick Schonning
2022-12-09helm: cleanup helm chart, now in mastodon/chart (#21801)Erik Sundell
2022-12-07Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.
2022-12-07See version file in GitHub Actions (#21927)Yamagishi Kazutoshi
2022-12-04Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-12-03Correct prettier calls for YML/JSON (#21832)Nick Schonning
* Fix fomat-check writing files * Fix unformatted YML/JSON * Add format-check call to prevent regressions
2022-11-17Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how docker images were built, including how they were cached. I don't know much about it, so applied upstream's changes. - `app/controllers/admin/domain_blocks_controller.rb`: The feature, that was in glitch-soc, got backported upstream. It also had a few fixes upstream, so those have been ported! - `app/javascript/packs/admin.js`: Glitch-soc changes have been backported upstream. As a result, some code from `app/javascript/core/admin.js` got added upstream. Kept our version since our shared Javascript already has that feature. - `app/models/user.rb`: Upstream added something to distinguish unusable and unusable-because-moved accounts, while glitch-soc considers moved accounts usable. Took upstream's code for `functional_or_moved?` and made `functional?` call it. - `app/views/statuses/_simple_status.html.haml`: Upstream cleaned up code style a bit, on a line that we had custom changes for. Applied upstream's change while keeping our change. - `config/initializers/content_security_policy.rb`: Upstream adopted one CSP directive we already had. The conflict is because of our files being structurally different, but the change itself was already part of glitch-soc. Kept our version.
2022-11-17Use buildx functions for faster build (#20692)Kohei Ota (inductor)
* Use buildx functions for faster build * move link * cannot use --link with --chown
2022-11-16Modify image build workflow for Glitch workflows (#1942)Effy Elden
2022-11-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.
2022-11-13helm: Add helm chart tests (#20394)Erik Sundell
* helm: Fix consistent list indentation * helm: Add helm lint and helm template tests * helm: Add helm template --validate test * helm: Add helm install test
2022-11-12ci: write permissions to packages (#1906)Jared Allard
2022-10-28Merge branch 'main' into glitch-soc/merge-upstreamClaire
2022-10-10Use pep440 for Docker image tag rules (#19332)Yamagishi Kazutoshi
2022-10-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
generated by cgit-pink (git 2.37.1) at 2024-11-19 13:53:46 +0000