about summary refs log tree commit diff
path: root/.github
AgeCommit message (Collapse)Author
2023-04-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `package.json`: Upstream removed a dependency that was textually close to a glitch-soc-only dependency. Removed the dependency as upstream did, while keeping the glitch-soc-only dependency.
2023-04-05Check for missing JSON translations (#24338)Nick Schonning
2023-04-04Add typechecking in CI (#24405)Nick Schonning
2023-03-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
2023-03-30Fix stale apt index in github actions (#24319)Claire
2023-03-27Add migration tests for user mail notification settings (#24277)Claire
2023-03-26Merge branch 'main' into glitch-soc/mainClaire
2023-03-23Use Yarn production install for asset compile (#24232)Nick Schonning
2023-03-23Fix docker images not being pushed (#2143)Plastikmensch
* Change repo from mastodon/mastodon to glitch-soc/mastodon Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> * Remove repo check from build-image workflow Reverts 0b8b0ef65221e5341cd81b212f0e40722ffd5ef7 Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com> --------- Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
2023-03-15Skip pushing containers on forks (#24106)Nick Schonning
2023-03-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.
2023-03-15Setup haml-lint CI with todo config (#23524)Nick Schonning
2023-03-15Skip Docker CI Login/Push on forks (#23564)Nick Schonning
2023-03-14Push Docker images to Github Container Registry as well (#24101)Renaud Chaput
2023-03-10Sync CI and Docker Compose image versions (#24053)Nick Schonning
2023-03-08Skip rebase-needed job for i10n branch (#24026)Nick Schonning
2023-03-08Skip double building on Dependabot branches (#24025)Nick Schonning
2023-03-07Convert CircleCI to GitHub Actions (#23608)Nick Schonning
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-17Enable Depependabot on Docker images (#23553)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
generated by cgit-pink (git 2.37.1) at 2024-06-18 11:31:02 +0000