6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
941a9df28a
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
2023-08-24 21:56:00 +02:00
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
30c191aaa0
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 16:40:04 +02:00
2dbbeedc94
Fix: Workaround to load MASTODON_VERSION_* in Docker. ( #26591 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 13:07:27 +02:00
2126812f65
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
Upstream moved some settings, where glitch-soc has an extra setting.
Ported upstream changes, moving the same settings as them.
2023-08-22 18:31:28 +02:00
facfec1ba3
Bump version to v4.2.0-beta2 ( #26579 )
2023-08-21 20:18:49 +02:00
dd049fc37a
Fix ES_PRESET not being applied to Chewy's internal index ( #26489 )
2023-08-14 19:00:56 +02:00
92df185be7
Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream
2023-08-13 19:23:22 +02:00
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
496eb6f7a4
Add missing instances option to tootctl search deploy ( #26461 )
2023-08-13 02:06:04 +02:00
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
dab54ccbba
Prepare v4.2.0-beta1 ( #26339 )
2023-08-08 16:12:12 +02:00
0e2a4d3897
Fix adding column with default value taking longer on Postgres >= 11 ( #26375 )
2023-08-08 09:09:58 +02:00
425d77f812
Fix crash in `tootctl status remove` and some old migrations ( #26210 )
2023-08-02 20:54:56 +02:00
51768de16e
Bump version to v4.1.6 ( #26272 )
2023-07-31 21:11:25 +02:00
92fa9d34b0
Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
Small conflict due to our theming system.
- `streaming/index.js`:
Upstream refactored part of the streaming server.
We had some extra logic for handling local-only posts.
Applied the refactor.
2023-07-30 16:11:55 +02:00
b2515feb29
Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream
2023-07-30 14:33:28 +02:00
12a6cf569e
Storage: add :azure to remaining callers ( #26080 )
2023-07-27 16:13:45 +02:00
b4e739ff0f
Change interaction modal in web UI ( #26075 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-07-27 16:11:17 +02:00
f2c683336b
Bump version to v4.1.5 ( #26108 )
2023-07-21 21:23:14 +02:00
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
f831452037
Refactor `Snowflake` to avoid brakeman sql injection warnings ( #25879 )
2023-07-12 10:44:58 +02:00
b8b2470cf8
Fix `Style/SlicingWithRange` cop ( #25923 )
2023-07-12 10:03:06 +02:00
b9aa228c54
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
0051128387
Bump version to v4.1.4 ( #25805 )
2023-07-07 19:42:03 +02:00
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
5e1752ce3f
Bump version to v4.1.3 ( #25757 )
2023-07-06 15:14:42 +02:00
65cbcce997
Merge commit '39110d1d0af5e3d9cf452ae47496a52797249fd0' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
b5675e265e
Add coverage for `CLI::Feeds` command ( #25319 )
2023-06-10 18:37:36 +02:00
07933db788
Add coverage for `CLI::Cache` command ( #25238 )
2023-06-10 18:36:09 +02:00
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
cd4f0feab8
Extract verify options method in search cli ( #25121 )
2023-06-01 14:35:05 +02:00
35c1c3e57a
Add CLI area progress bar helper ( #25208 )
2023-06-01 14:31:24 +02:00
dc26140d54
Use thor methods instead of tty prompt in maintenance cli ( #25207 )
2023-05-31 19:40:16 +02:00
1baf40077b
Fix FormatStringToken cop in CLI ( #25122 )
2023-05-30 16:21:53 +02:00
80c7de9984
Fix Rails/WhereExists cop in CLI ( #25123 )
2023-05-30 16:09:57 +02:00
b7b96efd17
Extract helper method for error report in cli/accounts command ( #25119 )
2023-05-30 16:09:15 +02:00
2cecb2dc9e
Increment index which was previously not used in maintenance CLI loop ( #25118 )
2023-05-30 16:08:47 +02:00
ec9bc7e604
Consistent usage of CLI `dry_run?` method ( #25116 )
2023-05-30 16:07:44 +02:00
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
2023-05-28 17:01:25 +02:00
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
2023-05-28 16:41:14 +02:00
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
2023-05-28 15:01:53 +02:00
55785b1603
Extract methods for user de-duping in maintenance CLI ( #25117 )
2023-05-26 09:42:16 +02:00
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2023-05-25 22:59:30 +02:00
384345b0de
Add CLI Base class for command line code ( #25106 )
2023-05-24 11:55:40 +02:00
b6b4ea4ca5
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
2023-05-23 16:08:26 +02:00
Claire