cbdb25ab03
Merge pull request #2151 from ClearlyClaire/glitch-soc/main
...
Merge upstream changes
2023-03-27 12:49:33 +02:00
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
2023-03-27 08:51:57 +02:00
00c839b9a9
[Glitch] Remove isNaN polyfill
...
Port b46125224c
2023-03-26 15:49:49 +02:00
14b0311029
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
6e8711ff91
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
503022d6f9
Exclude files for Rubocop Metrics/ClassLength ( #24213 )
2023-03-23 23:19:41 +01:00
e7e189fa44
Use Yarn production install for asset compile ( #24232 )
2023-03-23 22:49:47 +01:00
81e85782d1
Fix docker images not being pushed ( #2143 )
...
* Change repo from mastodon/mastodon to glitch-soc/mastodon
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove repo check from build-image workflow
Reverts 0b8b0ef652
2023-03-23 10:15:41 +01:00
867790e07a
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-23 10:15:13 +01:00
b46125224c
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
2023-03-22 20:00:33 +01:00
5ac380c122
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/status.rb`:
Upstream added lines close to a glitch-soc only line, not a real conflict.
Applied upstream's changes (added hooks) while keeping glitch-soc's changes
(`local_only` scope).
- `config/environments/production.rb`:
Upstream removed a header, while we have glitch-soc specific ones.
Removed the header removed upstream.
2023-03-22 19:50:11 +01:00
2626097869
Fix Rails cache namespace being overriden with `v2` for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
b179ff84c7
Add specs for Chewy importers ( #24204 )
2023-03-22 14:06:26 +01:00
148c3d5894
Update profile link verification instructions ( #19723 )
...
Co-authored-by: Effy Elden <effy@effy.space>
2023-03-22 11:22:35 +01:00
7f8e1bede4
Bump version to v4.1.1 ( #24201 )
2023-03-21 15:04:21 +01:00
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
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
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
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
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
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
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
0a9def5498
Fit the max-width of media in .prose to parent box ( #24180 )
2023-03-20 20:04:25 +01:00
7bef11630d
Remove references to non-existent actions ( #24183 )
2023-03-20 20:03:44 +01:00
bdeb6ff180
Fix crash in `tootctl` commands making use of parallelization when Elasticsearch is enabled ( #24182 )
2023-03-20 20:02:58 +01:00
0ca54a4105
Remove `Permissions-Policy` header from all responses ( #24124 )
2023-03-20 20:02:09 +01:00
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
94cbd808b5
Webhooks for local status.create, status.update, account.update ( #24133 )
2023-03-19 07:47:54 +01:00
9a111a615f
Merge pull request #2138 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-18 19:34:43 +01:00
3091a184ca
Merge branch 'main' into glitch-soc/merge-upstream
2023-03-18 11:21:03 +01:00
00fe0f6cb4
Merge pull request #2136 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-18 11:17:46 +01:00
34096bc6ea
Upgrade redis-node to latest ( #24154 )
2023-03-18 17:05:17 +09:00
f7b9b36fc3
Revert "Dedupe yarn.lock with yarn-deduplicate" ( #24155 )
2023-03-18 17:05:01 +09:00
9758112c97
Dedupe yarn.lock with yarn-deduplicate ( #24119 )
2023-03-18 16:09:39 +09:00
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
b22b4bac03
Include config/ and update all rubcop deps ( #23963 )
2023-03-17 10:13:28 +01:00
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
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
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
8f97ffe91e
[Glitch] Replace `Status#translatable?` with language matrix in separate endpoint
...
Port bd047acc35
2023-03-16 23:21:08 +01:00
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
f5daa20f2a
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-16 23:09:53 +01:00
681dcd3fa3
Ignore additional Style/OptionalBooleanParameter ( #24138 )
2023-03-16 23:07:25 +01:00
8fdf49b11d
Add warning for object storage misconfiguration ( #24137 )
2023-03-16 22:47:01 +01:00
75e5a6e437
Change user backups to use expiring URLs for download when possible ( #24136 )
2023-03-16 22:46:52 +01:00
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
Claire
neatchee
Nick Schonning
Yamagishi Kazutoshi
Plastikmensch
Christian Schmidt
mogamin
Matt Jankowski
Simon Elvery
Takeshi Umeda
dependabot[bot]
Eugen Rochko
Vyr Cossont
Jean byroot Boussier
CSDUMMI