93957daa50
Fix error when processing remote files with unusually long names ( #28823 )
2024-01-19 18:52:59 +00:00
6a5d70e146
Update pre_migration_check postgres version requirement ( #28800 )
2024-01-19 11:20:20 +00:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
2115bc52e4
Order by sql in `CLI::Maintenance` task ( #28289 )
2024-01-18 14:53:29 +00:00
81e4e65610
Update links to upstream migration helpers, remove unused methods ( #28781 )
2024-01-18 12:29:54 +00:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
127503eb2c
Fix `Rails/RakeEnvironment` cop ( #28782 )
2024-01-17 16:33:17 +00:00
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
2024-01-16 12:04:11 +01:00
01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )
2024-01-16 10:27:26 +00:00
4fcb372776
Fix Ruby linting issue
2024-01-15 20:57:55 +01:00
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
2024-01-15 18:04:58 +00:00
a3b6a85521
Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
...
Conflicts:
- `.prettierignore`:
Conflict due to glitch-soc-only files.
Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
2024-01-12 20:16:48 +00:00
df9e220364
Add JS console errors check ( #28682 )
2024-01-12 09:12:31 +00:00
b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )
2024-01-11 16:15:08 +00:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
630b245bb4
Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
Removed upstream, while glitch-soc had a change related to its theming system.
Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
0b2c7cdb02
Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/content_security_policy.rb`:
Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
environment variable.
Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
ea1c0feb86
Remove `add_column_with_default` migration helper ( #28654 )
2024-01-10 10:35:06 +00:00
173953c23e
Fix ISO code for Canadian French ( #26015 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
202951e6d9
Use Arel `in_order_of` method to generate CASE for `DomainBlock.by_severity` ( #28617 )
2024-01-08 11:15:36 +00:00
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
2024-01-05 21:57:47 +00:00
1af5c37701
Use heredoc on federation CLI warning strings ( #28578 )
2024-01-04 09:21:27 +00:00
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
f92d8c654d
Standardize on Thor methods in CLI classes ( #28566 )
2024-01-03 15:08:08 +00:00
5c769de096
Add spec coverage for `CLI::Media#remove_orphans` command ( #28267 )
2024-01-03 14:12:56 +00:00
c5b0e6d5a0
Merge branch 'main' into glitch-soc/merge-upstream
2023-12-28 16:57:10 +01:00
f5b7307890
Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's version of the conflicting lines.
2023-12-21 19:24:10 +01:00
6e56f95285
Merge commit '4a7395d989e40c3bd4ef18173aa5ea850c8ddcdd' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream modified its README, we have a completely different one.
Kept our README file.
2023-12-21 18:17:17 +01:00
2463b53363
More duplicates in cli maintenance spec, misc bug fixes ( #28449 )
2023-12-21 08:51:03 +00:00
077e0c6812
Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict caused by the `json` gem thing once again.
Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored a bunch of specs, including one place that differs
because of glitch-soc's theming system.
Refactored as upstream did, adapting it for glitch-soc's theming system.
2023-12-20 22:16:50 +01:00
75580360cd
Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
`Metrics/AbcSize` cop.
Glitch-soc has different code and slightly higher `AbcSize` complexity,
modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
Upstream changed `account.suspended?` to `account.unavailable?` to prepare
for delete flags. Glitch-soc has additional local-only conditions.
Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
Upstream refactored a bunch of stuff while glitch-soc has more settings.
Refactored as upstream did while keeping glitch-soc's settings.
2023-12-20 22:05:31 +01:00
b8209c3b96
Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream reworked the CSP, we kept our version for now.
- `spec/requests/content_security_policy_spec.rb`:
Upstream reworked the CSP, we kept our version for now.
2023-12-20 20:10:45 +01:00
d288a6162a
Merge commit '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream
2023-12-19 20:40:05 +01:00
c7c727994a
Add spec for `CLI::Maintenance#fix_duplicates` ( #28326 )
2023-12-19 13:10:33 +00:00
d6ad9d351e
Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream
2023-12-18 19:10:43 +01:00
46ddaffd40
Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream
2023-12-18 18:34:25 +01:00
cd2ee0ec5f
Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept ours.
- `yarn.lock`:
Upstream changed from yarn 1 to yarn 4, but we had some different
dependencies.
Updated to yarn 4 and re-added our dependencies.
2023-12-18 18:25:33 +01:00
bc33be0342
Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Conflict because we had updated the `json-ld` gem to fix a yanked dependency.
Kept our version of `json-ld` while updating other dependencies.
2023-12-18 18:07:24 +01:00
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
ddf3ad9541
Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main
...
Conflicts:
- `package.json`:
Upstream removed a dependency textually close to a glitch-only dependency.
Updated as upstream while keeping our dependency.
2023-12-17 17:43:30 +01:00
1c3b5f4a78
Fix reference to non-existent var in CLI maintenance command ( #28363 )
2023-12-14 14:02:33 +00:00
8a3d8c6c14
Remove the `stub_stdout` wrapper around CLI specs ( #28340 )
2023-12-13 10:14:19 +00:00
4a7395d989
Add `migrator_version` method to CLI maintenance script ( #28323 )
2023-12-12 11:56:39 +00:00
253393f3a8
Only attempt to remove indexes that exist in `CLI::Maintenance` script ( #28286 )
2023-12-11 08:04:45 +00:00
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
490e4969a1
Correct section naming in maintenance cli script ( #28279 )
2023-12-08 13:54:48 +00:00
8de86eabbf
Add spec for `CLI::Domains#crawl` command ( #28271 )
2023-12-08 09:51:57 +00:00
1d7b8234c9
Remove useless `reorder(nil)` call in `tootctl statuses` ( #28141 )
2023-12-07 09:41:00 +00:00
af66d3d836
Use `following` and `followers` scopes in CLI ( #28154 )
2023-12-06 14:15:54 +00:00
b3b009e6aa
Add spec coverage for `CLI::EmailDomainBlocks` commands ( #28181 )
2023-12-04 09:44:54 +00:00
3bc437b99a
Fix `Style/RedundantParentheses` cop ( #28176 )
2023-12-01 16:00:44 +00:00
a98fccf84e
Fix `Style/SelfAssignment` cop ( #28171 )
2023-12-01 15:52:52 +00:00
1564799952
Add spec coverage for media CLI `refresh` command ( #28166 )
2023-12-01 14:18:45 +00:00
440b80b2e7
Model concerns organization into module namespaces ( #28149 )
2023-12-01 11:00:41 +00:00
b696ca6b1a
Move self destruct CLI command definition code to module ( #28131 )
2023-11-30 10:48:46 +00:00
a1636fce7f
Move lib/devise/* to lib/devise/strategies/* ( #27638 )
2023-11-29 10:10:21 +00:00
31bef99b9e
Move lib/mastodon/premailer_webpack_strategy to lib/ ( #27636 )
2023-11-29 10:08:55 +00:00
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
2023-11-17 11:52:20 +00:00
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
2023-11-13 09:58:28 +00:00
c9204b792c
Fix `Rails/I18nLocaleTexts` cop ( #27779 )
2023-11-09 09:46:39 +00:00
757d7c73c0
Upgrade to Yarn 4, remove support for Node 16 ( #27073 )
2023-11-08 10:57:21 +00:00
370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command ( #25252 )
2023-11-07 15:21:58 +00:00
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
2023-11-07 13:01:09 +00:00
2d39268bc5
Fix `Lint/OrAssignmentToConstant` cop ( #27750 )
2023-11-07 09:11:50 +00:00
7ef56d6e50
Move json_ld context loaders to `config/initializers` ( #27590 )
2023-10-31 15:21:23 +00:00
4aa05d45fc
Capture minimum postgres version 12 ( #27528 )
2023-10-26 20:35:15 +00:00
62620956d5
Merge commit '9a3d047f3e604e581e18346424569e28fc9c5b96' into glitch-soc/merge-upstream
2023-10-25 19:59:17 +02:00
fa65c8244f
Fix cache store pool config deprecation warnings ( #27551 )
2023-10-25 12:01:21 +00:00
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
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
e6c3d3c744
Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream
2023-10-24 19:21:01 +02:00
57c0de949b
Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream changed how asset host CSP directives are used, and glitch-soc has
a pretty different CSP file.
It may be worth reconsidering the differences between upstream and glitch-soc
but for now, just port the change.
2023-10-24 19:17:20 +02:00
e93a75f1a1
Rails 7.1 update ( #25963 )
2023-10-23 17:58:29 +00:00
379115e601
Add SELF_DESTRUCT env variable to process self-destructions in the background ( #26439 )
2023-10-23 15:46:21 +00:00
79a63201a9
Fix Layout/EmptyLineAfterGuardClause issues caused by merging an old PR ( #27512 )
2023-10-23 16:21:48 +02:00
44edf3aa91
Improve error handling in mastodon:setup task ( #21464 )
2023-10-23 14:28:32 +02:00
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
2023-10-17 21:59:58 +02:00
65cd0700e4
Refactor domains cli to remove model call from regex ( #25878 )
2023-10-17 15:58:42 +02:00
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
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
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
8bb4706e11
Move migration_helpers Rubocop ignore to config ( #24236 )
2023-10-03 14:58:40 +02:00
937dc42f10
Extract methods for file movement in `CLI::Upgrade` ( #25120 )
2023-09-28 16:04:05 +02:00
f0c720cfc9
Bump version to v4.3.0-alpha.0 ( #27022 )
2023-09-28 13:40:43 +02:00
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
82eaa26d87
Update `tootctl maintenance fix-duplicates` to Mastodon v4.2.0 ( #27147 )
2023-09-26 11:11:52 +02:00
06444c86c7
Fix division by zero in video in bitrate computation code ( #27129 )
2023-09-25 17:07:52 +02:00
86ec1e833e
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-21 16:56:09 +02:00
4fcc026f0f
Bump version to v4.2.0 ( #27017 )
2023-09-21 16:51:32 +02:00
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
890e334703
Add migration tests for negative settings ( #27012 )
2023-09-21 12:33:30 +02:00
6a9e93ae19
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:32:48 +02:00
abcc0b38fa
Fix incorrect PostgreSQL version check ( #26979 )
2023-09-19 17:31:58 +02:00
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-19 17:07:29 +02:00
f4b780ba22
Bump version to v4.2.0-rc2 ( #26974 )
2023-09-19 17:04:23 +02:00
22ee4e057d
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
2023-09-19 12:59:23 +02:00
0f3f9b611f
Change video bitrate to always fit within size limit ( #26970 )
2023-09-19 12:25:58 +02:00
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
2023-09-15 21:39:21 +02:00
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
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
3ca94f6d4a
Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream
2023-09-15 20:21:40 +02:00
b90383d073
Bump version to v4.2.0-rc1 ( #26916 )
2023-09-14 18:46:00 +02:00
97f3d7b662
Fix Version metadata have trailing dot ( #2403 )
2023-09-13 08:47:39 +02:00
59af3c1310
Add PublicStatuses to tootctl search deploy --only option ( #26896 )
2023-09-12 09:59:59 +02:00
4d9186a48c
Add search tests ( #26703 )
2023-09-08 16:17:55 +02:00
3a679844e4
Fix `account_id`, `max_id` and `min_id` params not working in search ( #26847 )
2023-09-08 14:25:00 +02:00
ec48bc3610
Do not truncate backtrace when the `BACKTRACE` env variable is set ( #26794 )
2023-09-06 09:18:10 +02:00
87b5f84625
Merge commit 'f80f426c57d5a5e1d289372ef7c323741d27c768' into glitch-soc/merge-upstream
2023-09-05 08:14:52 +02:00
f80f426c57
Bump version to v4.2.0-beta3 ( #26753 )
2023-09-04 21:20:20 +02:00
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
cddef4c485
Fix language settings for users having selected the `kmr` language ( #26787 )
2023-09-04 17:56:31 +02:00
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
2023-09-02 15:02:29 +02:00
fbbe9f1c12
Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream
2023-09-02 12:20:33 +02:00
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
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
2023-09-01 17:47:07 +02:00
01b87a1632
Change video compression parameters ( #26631 )
2023-08-28 19:40:08 +02:00
f39847476c
Change the pre-release versioning scheme and associated environment variables ( #26653 )
2023-08-25 18:26:44 +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
b6b68b44a1
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
2023-08-24 21:03:56 +02:00
1b5d3fdc5e
Merge commit 'ee702e36e58d638bcf75b2eae2ca86499693465e' into glitch-soc/merge-upstream
2023-08-24 20:55:28 +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
3aac12981c
Fix unexpected audio stream transcoding when uploaded video is eligible to passthrough ( #26608 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-23 08:44:56 +02:00
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +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
b970ed6098
Update rubocop and rubocop-rspec ( #26329 )
2023-08-22 09:31:40 +02:00
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
facfec1ba3
Bump version to v4.2.0-beta2 ( #26579 )
2023-08-21 20:18:49 +02:00
e7bea8f004
Fix already initialized constant warning ( #26542 )
2023-08-18 16:06:46 +02:00
b95867ad1f
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
2023-08-18 08:18:40 +02:00
dd049fc37a
Fix ES_PRESET not being applied to Chewy's internal index ( #26489 )
2023-08-14 19:00:56 +02:00
3a8370e1f4
Fix `repo:changelog` task matching strings that are not Pull Request identifiers ( #26280 )
2023-08-14 18:47:43 +02:00
f5778caa3a
Add `ES_PRESET` option to customize numbers of shards and replicas ( #26483 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-08-14 17:46:16 +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
ea8802a05a
Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream
2023-08-12 09:36:38 +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
6b896b20cc
Add primary key to preview_cards_statuses join table (includes deduplication migration) ( #25243 )
2023-08-03 11:12:52 +02:00
425d77f812
Fix crash in `tootctl status remove` and some old migrations ( #26210 )
2023-08-02 20:54:56 +02:00
Claire