mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-04 21:29:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
17558 commits 5 branches 147 tags 265 MiB
Commit graph

96 commits

Author SHA1 Message Date
Jeremy Kescher
7318b74ebf
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/models/notification.rb
#	config/locales/simple_form.de.yml
 2023-03-05 12:34:16 +01:00
Claire
4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream 
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-25 14:00:40 +01:00
Jeremy Kescher
0e634397c3
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
 2023-02-21 00:40:08 +01:00
Nick Schonning
b65ca7acc9
Update rebase needed job settings (#23746) 2023-02-20 11:02:06 +01:00
Nick Schonning
a9472f8ff1
Fix Markdown files with Prettier and check in CI (#21972) 2023-02-20 07:37:28 +01:00
Renaud Chaput
44a7d87cb1
Rename JSX files with proper .jsx extension (#23733) 2023-02-20 03:20:59 +01:00
Claire
7452a95998 Merge branch 'main' into glitch-soc/merge-upstream 
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-19 10:42:55 +01:00
Nick Schonning
1d9ed91643
Move db migration CI to GitHub Actions (#23624) 2023-02-19 07:06:34 +01:00
Nick Schonning
de4b8224c0
Run bundler-audit on PRs (#23514) 2023-02-18 12:49:09 +01:00
Nick Schonning
7e215b3bda
Check for missing i18n strings in CI (#23368) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-02-18 12:46:44 +01:00
Nick Schonning
9ab2a775c9
Set CI concurrency at the job level (#23689) 2023-02-18 14:56:16 +09:00
Nick Schonning
e4f37fad98
Only run latest for PR Rebase job (#23688) 2023-02-18 04:25:31 +01:00
Jeremy Kescher
8de39432a9
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
#	app/javascript/flavours/glitch/actions/interactions.js
#	config/initializers/rack_attack.rb
#	config/locales/en_GB.yml
 2023-02-17 00:26:21 +01:00
Nick Schonning
68a92c81bf
Generate minimimal Rubocop Todo file (#23629) 2023-02-16 15:33:50 +09:00
Nick Schonning
29ec2c4fb5
Trigger CI build on .nvmrc change (#23627) 2023-02-16 04:59:45 +01:00
Nick Schonning
1f957c6325
Use .nvmrc file for CI setup-node (#23562) 2023-02-16 10:24:05 +09:00
Nick Schonning
418c3a4699
Move Jest tests to filtered GitHub Action (#23623) 2023-02-16 01:24:35 +01:00
Aaron Patterson
fb8503e861
Upgrade to Ruby 3.2 (#22928) 
Co-authored-by: Matthew Ford <matt@bitzesty.com>
 2023-02-15 08:30:27 +01:00
Claire
4ceadc65b0 Merge branch 'main' into glitch-soc/merge-upstream 2023-02-10 13:48:21 +01:00
Nick Schonning
f23d30100a
Cleanup unused i18n strings (#23426) 
* Remove partial 422/500 error translations

* Add missing siblings for i18n unused warnings

* Enable i18n unused string checking for all locales
 2023-02-09 22:46:42 +09:00
Claire
aeacebb3d7 Merge branch 'main' into glitch-soc/merge-upstream 
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-03 19:23:27 +01:00
Yamagishi Kazutoshi
420f33ccb9
Skip locales linting (#23352) 2023-02-01 15:15:11 +01:00
Claire
1c335ac53a
Fix official docker images nto being compatible with some cloud providers (#23354) 
See #23333 and https://github.com/docker/buildx/issues/1533
 2023-02-01 13:15:42 +01:00
dependabot[bot]
9400bdbce5
Bump docker/build-push-action from 3 to 4 (#23333) 
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-02-01 20:09:43 +09:00
Nick Schonning
56d1af753d
Only build latest commit on branch for image (#23306) 2023-01-30 03:07:19 +01:00
Nick Schonning
b58bf74e35
Filter Superlinter to Ruby files only (#21976) 2023-01-30 00:39:31 +01:00
Nick Schonning
4917e38d94
Separate Stylelint from Superlinter (#23303) 2023-01-30 00:23:52 +01:00
Nick Schonning
d9088ef327
Separate ESLint CI from Superlinter (#23029) 
* Separate ESLint CI from Superlinter

* Correct JS indenting level

* Remove extra semicolons with ESLint autofix
 2023-01-29 23:44:03 +01:00
Claire
3074338d79 Merge branch 'main' into glitch-soc/merge-upstream 2023-01-24 20:32:31 +01:00
dependabot[bot]
aed9d4f567
Bump hadolint/hadolint-action from 3.0.0 to 3.1.0 (#23234) 
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-24 09:48:05 +01:00
Jeremy Kescher
48373a71e3
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/components/status_action_bar.js
#	app/javascript/flavours/glitch/containers/status_container.js
#	app/javascript/flavours/glitch/features/status/components/action_bar.js
#	app/javascript/flavours/glitch/locales/de.json
#	app/javascript/flavours/glitch/locales/fr.json
#	app/javascript/mastodon/components/status_action_bar.js
#	app/javascript/mastodon/features/status/components/action_bar.js
#	config/locales-glitch/de.yml
#	config/locales-glitch/fr.yml
#	config/locales-glitch/simple_form.de.yml
#	config/locales-glitch/simple_form.fr.yml
 2023-01-05 23:29:53 +01:00
Claire
6c20dad201 Merge branch 'main' into glitch-soc/merge-upstream 
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-05 14:16:25 +01:00
Nick Schonning
a29cd2cdc2
Move Prettier CI checks to filtered jobs (#22376) 2023-01-05 13:45:21 +01:00
Jeremy Kescher
1661561640
Merge branch 'reactions' into develop 
# Conflicts:
#	Gemfile.lock
#	app/javascript/flavours/glitch/locales/de.js
#	app/javascript/flavours/glitch/locales/en.js
#	app/javascript/flavours/glitch/locales/es.js
#	app/javascript/flavours/glitch/locales/fr.js
#	app/javascript/flavours/glitch/locales/ja.js
#	app/javascript/flavours/glitch/locales/ko.js
#	app/javascript/flavours/glitch/locales/pl.js
#	app/javascript/flavours/glitch/locales/zh-CN.js
#	app/javascript/mastodon/actions/interactions.js
#	app/javascript/mastodon/locales/fr.json
#	db/migrate/20221124114030_create_status_reactions.rb
 2022-12-22 00:18:36 +01:00
Claire
b248aa4d3e Merge branch 'main' into glitch-soc/merge-upstream 2022-12-21 15:59:39 +01:00
Jeremy Kescher
a1a1d08890
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	.github/workflows/build-image.yml
#	Gemfile.lock
 2022-12-16 17:53:33 +01:00
Nick Schonning
3c70f0a9c9
Run Prettier on YML files (#22345) 2022-12-16 11:11:52 +09:00
Claire
f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
 2022-12-15 20:25:25 +01:00
Moritz Heiber
a0813806d6
Add hadolint as Dockerfile linter (#20993) 
* 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-15 15:57:17 +01:00
Justin Hutchings
e5d15a5b56
Add CodeQL workflow (#21894) 2022-12-15 15:51:13 +01:00
Jeremy Kescher
3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop 2022-12-09 23:46:41 +01:00
Claire
e877bb47b8 Merge branch 'main' into glitch-soc/main 2022-12-09 16:48:55 +01:00
Nick Schonning
e8481e67a7
Add CI job to label PRs with merge conflicts (#22020) 2022-12-09 06:37:13 +01:00
Erik Sundell
64bea71714
helm: cleanup helm chart, now in mastodon/chart (#21801) 2022-12-09 06:36:29 +01:00
Jeremy Kescher
7e19321520
Merge remote-tracking branch 'upstream/main' into develop 2022-12-07 17:49:14 +01:00
Claire
9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream 
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-07 09:03:42 +01:00
Yamagishi Kazutoshi
e538584fbe
See version file in GitHub Actions (#21927) 2022-12-07 00:30:59 +01:00
Jeremy Kescher
cf912c6ccb
Merge remote-tracking branch 'upstream/main' into develop 
# Conflicts:
#	Gemfile.lock
 2022-12-04 20:53:50 +01:00
Claire
3be6aff1a8 Merge branch 'main' into glitch-soc/merge-upstream 2022-12-04 17:22:57 +01:00
Nick Schonning
f77ed3a6b2
Correct prettier calls for YML/JSON (#21832) 
* Fix fomat-check writing files

* Fix unformatted YML/JSON

* Add format-check call to prevent regressions
 2022-12-03 12:05:35 +09:00