Takeshi Umeda
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
dependabot[bot]
9f8d1601a4
Bump stackprof from 0.2.23 to 0.2.24 ( #24190 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:25:19 +01:00
dependabot[bot]
a4d285f2f9
Bump prettier from 2.8.4 to 2.8.5 ( #24188 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:51:31 +09:00
dependabot[bot]
de6d504023
Bump stylelint from 15.2.0 to 15.3.0 ( #24185 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:49:48 +09:00
dependabot[bot]
f20843e60d
Bump react-select from 5.7.0 to 5.7.1 ( #24187 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:47:25 +09:00
dependabot[bot]
84f14b2451
Bump rack-cors from 1.1.1 to 2.0.1 ( #24189 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 10:42:34 +09:00
dependabot[bot]
4f4cbce295
Bump pghero from 3.3.0 to 3.3.1 ( #24186 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-21 00:56:45 +01:00
Jeremy Kescher
60298487f1
Bump Catstodon version
2023-03-20 23:23:17 +01:00
Jeremy Kescher
946c91d7d9
Merge remote-tracking branch 'upstream/main' into develop
2023-03-20 23:22:41 +01:00
mogamin
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
Matt Jankowski
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
Claire
bdeb6ff180
Fix crash in tootctl commands making use of parallelization when Elasticsearch is enabled ( #24182 )
2023-03-20 20:02:58 +01:00
Eugen Rochko
0ca54a4105
Remove Permissions-Policy header from all responses ( #24124 )
2023-03-20 20:02:09 +01:00
Plastikmensch
02ac94490a
Add getting-started-misc to route ( #2141 )
...
* Add getting-started-misc to web_app_paths
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add signed in check to navigation entries
Enabling routing for getting-started-misc allows the column to be directly accessible, which showed every entry and threw unnecessary errors.
Also fixed the keys as these were literally "i++".
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove "Extended information" from getting-started-misc
I couldn't find any reference to this translation string, so I removed it too.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-19 17:26:02 +01:00
Vyr Cossont
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
Jeremy Kescher
2cb88f5baa
Merge remote-tracking branch 'upstream/main' into develop
...
Conflicts:
- .github/workflows/build-image.yml
We don't use GitHub Actions for building Docker images.
- Gemfile.lock
Versions were upgraded upstream that conflicted with our changes, simply applied upstream changes.
2023-03-19 01:57:28 +01:00
Claire
9a111a615f
Merge pull request #2138 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-18 19:34:43 +01:00
Claire
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
Claire
00fe0f6cb4
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-18 11:17:46 +01:00
Nick Schonning
34096bc6ea
Upgrade redis-node to latest ( #24154 )
2023-03-18 17:05:17 +09:00
Nick Schonning
f7b9b36fc3
Revert "Dedupe yarn.lock with yarn-deduplicate" ( #24155 )
2023-03-18 17:05:01 +09:00
Nick Schonning
9758112c97
Dedupe yarn.lock with yarn-deduplicate ( #24119 )
2023-03-18 16:09:39 +09:00
Jean byroot Boussier
160f38f03d
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 ( #24142 )
...
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-17 14:37:30 +01:00
Jeremy Kescher
255ea1c131
v4.1.0+2.0.5
2023-03-17 13:01:21 +01:00
Jeremy Kescher
abc56dff2c
Update CatCatNya~ prod config
2023-03-17 13:00:32 +01:00
Jeremy Kescher
fd351e4b3c
Move back to Ruby 3.2.1
...
Previous commit fixes the issue, so we move back to Ruby 3.2.1.
2023-03-17 12:45:16 +01:00
Jean Boussier
03a96ba2e1
Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2
...
Fix: https://github.com/mastodon/mastodon/issues/23644
As mentioned on that other thread, the issue arise when a `Status`
is created with SHAPE_TOO_COMPLEX making the instance variable ordering
unpredictable.
But we can sidestep that issue using code inspired from Shopify/paquito.
I added some code in the test environment initializer to cause this
issue to be reproduced and prove this change fixes it.
This code is also easily converted into a monkey patch.
2023-03-17 11:37:22 +00:00
Nick Schonning
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
CSDUMMI
d75a1e5054
Link to the Identity provider's account settings from the account settings ( #24100 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-17 10:09:01 +01:00
dependabot[bot]
be9a4912d8
Bump rimraf from 4.1.2 to 4.4.0 ( #24048 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-17 10:08:10 +01:00
dependabot[bot]
f53970abce
Bump glob from 8.1.0 to 9.3.0 ( #24110 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-17 09:43:16 +01:00
Jeremy Kescher
080569b3fd
Remove fetch_value issue logging
...
Since we've moved back to Ruby 3.1.3 in 9aa172f7dfhttps://github.com/mastodon/mastodon/issues/23644#issuecomment-1472637530 .
As such, we no longer need this logging, and should be able to upgrade past Ruby 3.1 once the marshaller does ordering correctly again or Rails is changed to do custom marshalling.
2023-03-17 07:54:37 +01:00
Jeremy Kescher
24e9a23fe6
Merge remote-tracking branch 'upstream/main' into develop, bump version
...
Conflicts:
- .github/workflows/build-image.yml
We're not building an image with GitHub Actions.
2023-03-17 07:27:28 +01:00
Jeremy Kescher
9aa172f7df
Move back to Ruby 3.1.3
2023-03-17 07:22:12 +01:00
Christian Schmidt
8f97ffe91e
[Glitch] Replace Status#translatable? with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +01:00
Claire
193250556c
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have our own.
Kept ours.
- `app/helpers/application_helper.rb`:
Minor code style fix upstream, on a line that is different in glitch-soc
due to the different theming system.
Applied the code style fix to our own code.
- `app/views/settings/preferences/appearance/show.html.haml`:
Code style fix on a line next to lines exclusive to glitch-soc.
Applied upstream changes.
- `yarn.lock`:
Upstream updated a dependency textually close to a glitch-soc-only
dependency.
Updated the dependency like upstream did.
2023-03-16 23:12:59 +01:00
Claire
f5daa20f2a
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-16 23:09:53 +01:00
Nick Schonning
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter ( #24138 )
2023-03-16 23:07:25 +01:00
Claire
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
Eugen Rochko
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
Matt Jankowski
edc7ca5920
Roll back unintentionally activated rubocop rules ( #24132 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-03-16 22:24:01 +01:00
Eugen Rochko
a085901108
New Crowdin updates ( #23904 )
...
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
2023-03-16 21:02:00 +09:00
Christian Schmidt
bd047acc35
Replace Status#translatable? with language matrix in separate endpoint ( #24037 )
2023-03-16 11:07:24 +01:00
Eugen Rochko
630436ab2d
Refactor monkey-patching of PrivateAddressCheck ( #24122 )
2023-03-16 04:33:38 +01:00
Nick Schonning
aa947a143b
Regen rubocop-todo without Max shadowing ( #24076 )
2023-03-16 12:31:08 +09:00
dependabot[bot]
f57bcb028b
Bump sass from 1.58.3 to 1.59.3 ( #24105 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16 11:11:54 +09:00
dependabot[bot]
aa7d63d9aa
Bump autoprefixer from 10.4.13 to 10.4.14 ( #24108 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16 10:56:03 +09:00
Eugen Rochko
f0e727f958
Add cache headers to static files served through Rails ( #24120 )
2023-03-16 02:55:54 +01:00
dependabot[bot]
be488adf71
Bump @babel/core from 7.21.0 to 7.21.3 ( #24111 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-03-16 10:55:29 +09:00
Eugen Rochko
8cb2543ee5
Add SENDFILE_HEADER environment variable ( #24123 )
2023-03-16 02:55:13 +01:00
