Vyr Cossont
13db7d0075
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
Vyr Cossont
88fc04d3d7
Serialize status webhook events in REST API format ( #24243 )
2023-03-27 09:14:21 +02:00
Matt Jankowski
48befe5dbd
Update strong_migrations to version 0.8.0 ( #24270 )
2023-03-27 09:11:10 +02:00
Matt Jankowski
5b7898230e
Update strong_migrations to version 0.8.0 ( #24270 )
2023-03-27 09:11:10 +02:00
neatchee
a73b29e8cc
[Glitch] Remove legacy decorators syntax
...
Port e272fc91e4
to glitch-soc
2023-03-27 08:51:57 +02:00
neatchee
8215df76c0
[Glitch] Remove legacy decorators syntax
...
Port d1b057a0ac
to glitch-soc
2023-03-27 08:51:57 +02:00
Nick Schonning
6ff64efd07
Setup Husky and lint-stage for commit fixing ( #23308 )
2023-03-27 05:17:19 +02:00
Nick Schonning
34225d7199
Setup Husky and lint-stage for commit fixing ( #23308 )
2023-03-27 05:17:19 +02:00
Nick Schonning
57e9fc7e5a
[Glitch] Remove isNaN polyfill
...
Port 169b9c9b13
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-26 15:49:49 +02:00
Nick Schonning
00c839b9a9
[Glitch] Remove isNaN polyfill
...
Port b46125224c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-26 15:49:49 +02:00
Claire
6a5a699fbb
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
Claire
14b0311029
Merge branch 'main' into glitch-soc/main
2023-03-26 15:47:12 +02:00
mogamin
c88fc5179b
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
mogamin
63a6808ee1
Fix typo in _login_activity.html.haml ( #24263 )
2023-03-26 10:59:14 +02:00
Matt Jankowski
38e94af384
Reset model in migration after removing column ( #24250 )
2023-03-26 00:40:36 +01:00
Matt Jankowski
3557a65bb2
Reset model in migration after removing column ( #24250 )
2023-03-26 00:40:36 +01:00
Matt Jankowski
85e90f4b7d
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
Matt Jankowski
0663803348
Move link header setting to after_action ( #24251 )
2023-03-26 00:40:01 +01:00
Matt Jankowski
32553ac00c
Migration warning helper, and only run in production env ( #24253 )
2023-03-26 00:39:24 +01:00
Matt Jankowski
b9e34ef098
Migration warning helper, and only run in production env ( #24253 )
2023-03-26 00:39:24 +01:00
Matt Jankowski
cc5208f020
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
Matt Jankowski
e633b26f4f
Add allow_other_host in redirects which may go outside app ( #24252 )
2023-03-26 00:38:32 +01:00
Matt Jankowski
4e6cf24ce9
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
Matt Jankowski
e63524f457
Update retention model sql query ( #24249 )
2023-03-26 00:37:57 +01:00
Eugen Rochko
1d2a941bc8
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Eugen Rochko
9bda933740
Change media upload limits and remove client-side resizing ( #23726 )
2023-03-25 10:00:03 +01:00
Eugen Rochko
f185c40714
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
Eugen Rochko
ef127c964a
Change design of account rows in web UI ( #24247 )
2023-03-25 08:46:32 +01:00
Yamagishi Kazutoshi
8b68ca7e61
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
6e8711ff91
Add missing parenthesis ( #24238 )
2023-03-24 04:35:43 +01:00
Yamagishi Kazutoshi
e272fc91e4
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Yamagishi Kazutoshi
d1b057a0ac
Remove legacy decorators syntax ( #18357 )
2023-03-24 03:17:53 +01:00
Nick Schonning
2ed77774f7
Exclude files for Rubocop Metrics/ClassLength ( #24213 )
2023-03-23 23:19:41 +01:00
Nick Schonning
503022d6f9
Exclude files for Rubocop Metrics/ClassLength ( #24213 )
2023-03-23 23:19:41 +01:00
Nick Schonning
313feca996
Use Yarn production install for asset compile ( #24232 )
2023-03-23 22:49:47 +01:00
Nick Schonning
e7e189fa44
Use Yarn production install for asset compile ( #24232 )
2023-03-23 22:49:47 +01:00
Plastikmensch
148744b14b
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 a3037c8e71
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-23 10:15:41 +01:00
Plastikmensch
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
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-03-23 10:15:41 +01:00
Claire
fa8a87da5c
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-23 10:15:13 +01:00
Claire
867790e07a
Merge pull request #2144 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-03-23 10:15:13 +01:00
Nick Schonning
169b9c9b13
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Nick Schonning
b46125224c
Remove isNaN polyfill ( #24224 )
2023-03-23 09:47:13 +01:00
Christian Schmidt
61e7fe2e2a
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
Christian Schmidt
16da4a09e8
Fix broken links in account gallery ( #24218 )
2023-03-23 05:17:29 +01:00
mogamin
aa45960804
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 6ffb8609f9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-22 20:00:33 +01:00
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-03-22 20:00:33 +01:00
Claire
d11d2dda17
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
Claire
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
Claire
12eb6740d1
Fix Rails cache namespace being overriden with v2
for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00
Claire
2626097869
Fix Rails cache namespace being overriden with v2
for cached statuses ( #24202 )
2023-03-22 15:47:44 +01:00