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
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
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
2023-03-22 20:00:33 +01:00
mogamin
b4f60bc6de
[Glitch] Fit the max-width of media in .prose to parent box
...
Port 0a9def5498
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
Matt Jankowski
4e4b2bc78e
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
Matt Jankowski
a7a578a055
Remove unused InstancePresenter methods ( #24206 )
2023-03-22 14:15:22 +01:00
Matt Jankowski
d38c3ba12e
Add specs for Chewy importers ( #24204 )
2023-03-22 14:06:26 +01:00
Matt Jankowski
b179ff84c7
Add specs for Chewy importers ( #24204 )
2023-03-22 14:06:26 +01:00
Simon Elvery
a3674b0e32
Update profile link verification instructions ( #19723 )
...
Co-authored-by: Effy Elden <effy@effy.space>
2023-03-22 11:22:35 +01:00
Simon Elvery
148c3d5894
Update profile link verification instructions ( #19723 )
...
Co-authored-by: Effy Elden <effy@effy.space>
2023-03-22 11:22:35 +01:00
Claire
f8486dc29a
Bump version to v4.1.1 ( #24201 )
2023-03-21 15:04:21 +01:00
Claire
7f8e1bede4
Bump version to v4.1.1 ( #24201 )
2023-03-21 15:04:21 +01:00
Takeshi Umeda
df68ba2e6a
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
Takeshi Umeda
38c84f57b6
Refactoring relations_map ( #24195 )
2023-03-21 10:32:58 +01:00
dependabot[bot]
a3268654d5
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]
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]
bd5bc8798c
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]
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]
582793fc24
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
