1
0
Commit Graph

731 Commits

Author SHA1 Message Date
Noa Himesaka
c9e154f91b
Merge branch 'glitch-soc:main' into main 2023-12-19 15:01:56 +09:00
Claire
4113fbf6e8 Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.
2023-12-17 23:04:16 +01:00
Noa Himesaka
b78f7f0c46 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-12-14 21:51:07 +09:00
Claire
9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
2023-12-10 18:05:02 +01:00
Matt Jankowski
45770c9306
Fix Performance/MapMethodChain cop (#27744) 2023-11-07 13:01:09 +00:00
Noa Himesaka
d793cdab75 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-30 14:54:36 +09:00
Matt Jankowski
4aa05d45fc
Capture minimum postgres version 12 (#27528) 2023-10-26 20:35:15 +00:00
Claire
62620956d5 Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Claire
fa65c8244f
Fix cache store pool config deprecation warnings (#27551) 2023-10-25 12:01:21 +00:00
Claire
e25cc4deb7 Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
Conflicts:
- `config/navigation.rb`:
  Conflict due to glitch-soc having extra navigation items for its theming
  system.
  Ported upstream changes.
2023-10-24 19:31:14 +02:00
Claire
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background (#26439) 2023-10-23 15:46:21 +00:00
Noa Himesaka
3697bb6811 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-20 13:28:13 +09:00
Claire
63179f0bf4 Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Matt Jankowski
65cd0700e4
Refactor domains cli to remove model call from regex (#25878) 2023-10-17 15:58:42 +02:00
Noa Himesaka
5894051838
Merge branch 'glitch-soc:main' into main 2023-10-11 10:23:34 +09:00
Claire
ac2370778a Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
Conflicts:
- `config/environments/production.rb`:
  Upstream enforced a code style change and glitch-soc had a few different lines.
  Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
Claire
d7fcd70023 Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/cors.rb`:
  Upstream refactored this file, and glitch-soc had local changes.
  I could not find the rationale for the glitch-soc changes, so I
  used upstream's version.
2023-10-08 16:41:56 +02:00
Claire
19ebf7797e Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
Nick Schonning
8bb4706e11
Move migration_helpers Rubocop ignore to config (#24236) 2023-10-03 14:58:40 +02:00
Noa Himesaka
25b4ae38e7 Glitch-YRYR YRYRi release 2023-10-01 20:09:35 +09:00
Noa Himesaka
dcbe49f91b Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-01 20:01:10 +09:00
Matt Jankowski
937dc42f10
Extract methods for file movement in CLI::Upgrade (#25120) 2023-09-28 16:04:05 +02:00
Claire
f0c720cfc9
Bump version to v4.3.0-alpha.0 (#27022) 2023-09-28 13:40:43 +02:00
Claire
abdb58840a Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
Claire
82eaa26d87
Update tootctl maintenance fix-duplicates to Mastodon v4.2.0 (#27147) 2023-09-26 11:11:52 +02:00
Noa Himesaka
2689451981 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-22 13:38:24 +09:00
Claire
86ec1e833e Merge branch 'main' into glitch-soc/merge-upstream 2023-09-21 16:56:09 +02:00
Claire
4fcc026f0f
Bump version to v4.2.0 (#27017) 2023-09-21 16:51:32 +02:00
Noa Himesaka
bb54d35539 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-20 10:32:05 +09:00
Claire
6a9e93ae19 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:32:48 +02:00
Claire
abcc0b38fa
Fix incorrect PostgreSQL version check (#26979) 2023-09-19 17:31:58 +02:00
Claire
f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
Claire
f4b780ba22
Bump version to v4.2.0-rc2 (#26974) 2023-09-19 17:04:23 +02:00
Noa Himesaka
9aac7933bd Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-17 13:43:33 +09:00
Claire
5ed72f668f Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire
e193c848fe Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
2023-09-15 21:25:05 +02:00
Claire
08b495d95c Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire
3ca94f6d4a Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire
b90383d073
Bump version to v4.2.0-rc1 (#26916) 2023-09-14 18:46:00 +02:00
Jeong Arm
97f3d7b662
Fix Version metadata have trailing dot (#2403) 2023-09-13 08:47:39 +02:00
Jeong Arm
59af3c1310
Add PublicStatuses to tootctl search deploy --only option (#26896) 2023-09-12 09:59:59 +02:00
Noa Himesaka
b947d4a54d
Merge branch 'glitch-soc:main' into main 2023-09-10 12:57:51 +09:00
Eugen Rochko
3a679844e4
Fix account_id, max_id and min_id params not working in search (#26847) 2023-09-08 14:25:00 +02:00
Claire
ec48bc3610
Do not truncate backtrace when the BACKTRACE env variable is set (#26794) 2023-09-06 09:18:10 +02:00
Claire
87b5f84625 Merge commit 'f80f426c57d5a5e1d289372ef7c323741d27c768' into glitch-soc/merge-upstream 2023-09-05 08:14:52 +02:00
Claire
f80f426c57
Bump version to v4.2.0-beta3 (#26753) 2023-09-04 21:20:20 +02:00
Noa Himesaka
845eb40be1 version name fix 2023-09-04 23:46:18 +09:00
Noa Himesaka
d79d7e2215 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-04 11:47:59 +09:00
Claire
c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
2023-09-02 11:56:09 +02:00