Commit Graph

929 Commits (5b69f3db1005bc3c00c7e903fa4638557d15b942)

Author SHA1 Message Date
anna 5b69f3db10
merge catcatnya/main into main 1 year ago
Jeremy Kescher 3e17e5b2cb
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
Claire e877bb47b8 Merge branch 'main' into glitch-soc/main 1 year ago
anna e0c55d6043
bump to nyastodon 1.1.8 1 year ago
anna 380567f453
merge catstodon/main into main 1 year ago
Jeremy Kescher 7e19321520
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
anna ea10eabad6
merge catstodon/main into main 1 year ago
Claire c52263f6f8
Fix deprecation warning in `tootctl accounts rotate` (#22120) 1 year ago
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.
1 year ago
Claire 66a70ebb6e
Fix pre-4.0 admin action logs (#22091)
* Fix BackfillAdminActionLogs post-deployment migration

* Improve migration tests

* Backfill admin action logs again
1 year ago
Jeremy Kescher 8a24bef2e3
Fix Redis warnings regarding version 5.0.0 1 year ago
Jeremy Kescher 3520ebbd3b
v4.0.2+1.0.10 1 year ago
Jeremy Kescher 9554a005cd
v4.0.2+1.0.9 1 year ago
anna fec439df28
bump to nyastodon 1.1.7 1 year ago
anna c501a17b1f
merge catstodon/main into main 1 year ago
anna fdc8dce395
bump to nyastodon 1.1.6 1 year ago
Jeremy Kescher 32600375b3
Merge remote-tracking branch 'upstream/main' into develop 1 year ago
anna 58145e775f
bump to nyastodon 1.1.5 1 year ago
anna ca4df02956
merge catcatnya/main into main 1 year ago
Jeremy Kescher bbbf5f1746
Upgrade ruby dependencies 1 year ago
anna 57e46f4aaf
merge catstodon/main into main 1 year ago
anna 4489c51bb9
bump to nyastodon 1.1.4 1 year ago
anna ddeda89821
bump to nyastodon 1.1.3 1 year ago
anna 4e041d1e00
bump to nyastodon 1.1.2 1 year ago
anna 7f157c35cf
bump to nyastodon 1.1.1 1 year ago
Jeremy Kescher 730a09f642
v4.0.2+1.0.6 1 year ago
anna 0157438894
merge catcatnya/main into main 1 year ago
anna 1a84936322
bump to nyastodon 1.1.0 1 year ago
Claire a2e7997592 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README is completely different.
  Discarded upstream changes.
1 year ago
Claire 098ced7420
Remove support for Ruby 2.6 (#21477)
As pointed out by https://github.com/mastodon/mastodon/pull/21297#discussion_r1028372193
at least one of our dependencies already dropped support for Ruby 2.6, and we
had removed Ruby 2.6 tests from the CI over a year ago (#16861).

So stop advertising Ruby 2.6 support, bump targeted version, and drop some
compatibility code.
1 year ago
Claire d587a268fd
Add logging for Rails cache timeouts (#21667)
* Reduce redis cache store connect timeout from default 20 seconds to 5 seconds

* Log cache store errors
1 year ago
Jeremy Kescher 0897c13799
v4.0.2+1.0.5 2 years ago
Jeremy Kescher f34d3b838e
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
anna 1bfdff6795
bump to nyastodon 1.1.0-beta2 2 years ago
anna 7b4f3d2647
bump to nyastodon 1.1.0beta1 2 years ago
anna 8380f9fc2c
merge catstodon/main into main 2 years ago
Jeremy Kescher 41ce71cc92
Merge remote-tracking branch 'upstream/main' into develop 2 years ago
anna 1b7839f00a
merge catcatnya/main into main 2 years ago
anna 1792b688ac
bump to nyastodon 1.0.3 2 years ago
Jeremy Kescher 1381fb355c
v4.0.2+1.0.2 2 years ago
anna 9d14085607
bump to nyastodon 1.0.2 2 years ago
anna 44689beb43
merge catcatnya/main into main 2 years ago
Jeremy Kescher 874d4a2585
v4.0.2+1.0.1 2 years ago
anna 7c7f2d1b91
merge catcatnya/main into main 2 years ago
Jeremy Kescher 82e063ac6c
Merge remote-tracking branch 'upstream/main' into develop
# Conflicts:
#	.github/workflows/build-image.yml
2 years ago
Claire 1901829f9a Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Our config file is pretty different from upstream.
  Upstream changed CSP directive `script-src` to include
  `wasm-unsafe-eval` instead of `unsafe-eval`, which we
  did not include.
  Added `wasm-unsafe-eval` to `script-src` to fix
  execution of the OCR web worker.
- `package.json`:
  Upstream updated a dependency (`array-includes`) textually
  adjacent to a glitch-soc-only dependency (`atrament`).
  Updated `array-includes` as upstream did.
2 years ago
anna baab85fac7
add post suffix version 2 years ago
Jeremy Kescher 6d5a8d89d1
4.0.1+1.0.4 2 years ago
Eugen Rochko 03b0f3ac83
Bump version to 4.0.2 (#20725) 2 years ago
Jeremy Kescher 4b56353f13
Merge remote-tracking branch 'upstream/main' into develop 2 years ago