Age | Commit message (Collapse) | Author |
|
unattached media
Port 31005aad12c6a915a00501765a6dab25878326cb to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 553b169d483e9b2f28007e130a494aec08a1720a to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 5e796dc6f85b37c8378fe01cfd8ac23222c89eea to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
in web UI
Port 6774c339b2e22fc9cadcb466139745661d0b3c83 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port cf4992c918459187962a9e2f389f9ccb4f1b825d to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 53d26cfc1cc2779f699f3d3d56696484faefe87c to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
logged out
Port 894ce3726a38733ea7b8c880658b962f92d021ae to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Port 99734ac9367eb8af705aecca423c998aadddbd59 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
light theme
Port 89a6b76f999635e077e9469efd9d94cd6c6d6222 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
Conflicts:
- `app/models/account.rb`:
Conflict because we (glitch-soc) have disabled trending of posts without
review.
Discarded that upstream change.
- `app/views/admin/settings/discovery/show.html.haml`:
Just an extra setting in glitch-soc.
Kept that extra setting.
|
|
Fixes #1890
|
|
|
|
Add “Glitch-only” label to some settings
|
|
|
|
|
|
ClearlyClaire/glitch-soc/fixes/not-recommended-label
Fix “not recommended” label being shown as “recommended”
|
|
|
|
Port SCSS changes from 546672e292dc3218e996048464c4c52e5d00f766 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
include statuses (#17977)""
This reverts commit bfc539cfb4f040fcffac740b36791c26c2a74119.
|
|
Fixes #1914
|
|
* New translations en.json (Asturian)
* New translations en.yml (Telugu)
* New translations en.yml (Tamil)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Spanish, Argentina)
* New translations en.yml (Spanish, Argentina)
* New translations en.json (Spanish, Mexico)
* New translations en.yml (Spanish, Mexico)
* New translations en.yml (Bengali)
* New translations en.yml (Marathi)
* New translations en.yml (Croatian)
* New translations en.yml (Kazakh)
* New translations en.yml (Estonian)
* New translations en.json (Latvian)
* New translations en.yml (Hindi)
* New translations en.yml (Malay)
* New translations en.yml (Asturian)
* New translations en.json (Occitan)
* New translations simple_form.en.yml (Basque)
* New translations simple_form.en.yml (Spanish)
* New translations simple_form.en.yml (Arabic)
* New translations simple_form.en.yml (Bulgarian)
* New translations simple_form.en.yml (Catalan)
* New translations simple_form.en.yml (Danish)
* New translations simple_form.en.yml (German)
* New translations simple_form.en.yml (Greek)
* New translations simple_form.en.yml (Frisian)
* New translations simple_form.en.yml (Finnish)
* New translations simple_form.en.yml (Romanian)
* New translations simple_form.en.yml (Irish)
* New translations simple_form.en.yml (Hebrew)
* New translations simple_form.en.yml (Hungarian)
* New translations simple_form.en.yml (Armenian)
* New translations simple_form.en.yml (Italian)
* New translations simple_form.en.yml (Japanese)
* New translations simple_form.en.yml (Georgian)
* New translations simple_form.en.yml (French)
* New translations simple_form.en.yml (Vietnamese)
* New translations en.yml (Occitan)
* New translations en.yml (Serbian (Latin))
* New translations en.json (Kurmanji (Kurdish))
* New translations en.yml (Kurmanji (Kurdish))
* New translations en.json (Sorani (Kurdish))
* New translations en.yml (Sorani (Kurdish))
* New translations en.yml (Corsican)
* New translations simple_form.en.yml (Norwegian)
* New translations simple_form.en.yml (Polish)
* New translations simple_form.en.yml (Sinhala)
* New translations en.yml (Kabyle)
* New translations en.yml (Sardinian)
* New translations en.yml (Taigi)
* New translations en.yml (Silesian)
* New translations en.yml (Standard Moroccan Tamazight)
* New translations en.yml (Sanskrit)
* New translations simple_form.en.yml (Tatar)
* New translations simple_form.en.yml (Welsh)
* New translations simple_form.en.yml (Esperanto)
* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)
* New translations simple_form.en.yml (Malayalam)
* New translations simple_form.en.yml (Kazakh)
* New translations simple_form.en.yml (Breton)
* New translations simple_form.en.yml (Scottish Gaelic)
* New translations activerecord.en.yml (Scottish Gaelic)
* New translations simple_form.en.yml (Asturian)
* New translations simple_form.en.yml (Occitan)
* New translations simple_form.en.yml (Serbian (Latin))
* New translations simple_form.en.yml (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Sorani (Kurdish))
* New translations simple_form.en.yml (Estonian)
* New translations simple_form.en.yml (Norwegian Nynorsk)
* New translations simple_form.en.yml (Portuguese)
* New translations simple_form.en.yml (Galician)
* New translations simple_form.en.yml (Russian)
* New translations simple_form.en.yml (Slovak)
* New translations simple_form.en.yml (Albanian)
* New translations simple_form.en.yml (Serbian (Cyrillic))
* New translations simple_form.en.yml (Turkish)
* New translations simple_form.en.yml (Ukrainian)
* New translations simple_form.en.yml (Icelandic)
* New translations simple_form.en.yml (Croatian)
* New translations activerecord.en.yml (Icelandic)
* New translations simple_form.en.yml (Persian)
* New translations simple_form.en.yml (Tamil)
* New translations simple_form.en.yml (Spanish, Argentina)
* New translations simple_form.en.yml (Spanish, Mexico)
* New translations simple_form.en.yml (Bengali)
* New translations simple_form.en.yml (Corsican)
* New translations activerecord.en.yml (Portuguese, Brazilian)
* New translations activerecord.en.yml (Slovak)
* New translations activerecord.en.yml (Dutch)
* New translations activerecord.en.yml (Norwegian)
* New translations activerecord.en.yml (Polish)
* New translations activerecord.en.yml (Portuguese)
* New translations activerecord.en.yml (Russian)
* New translations activerecord.en.yml (Japanese)
* New translations activerecord.en.yml (Albanian)
* New translations activerecord.en.yml (Serbian (Cyrillic))
* New translations activerecord.en.yml (Swedish)
* New translations activerecord.en.yml (Turkish)
* New translations activerecord.en.yml (Ukrainian)
* New translations activerecord.en.yml (Chinese Simplified)
* New translations activerecord.en.yml (Vietnamese)
* New translations activerecord.en.yml (Galician)
* New translations activerecord.en.yml (Georgian)
* New translations activerecord.en.yml (Italian)
* New translations activerecord.en.yml (Catalan)
* New translations activerecord.en.yml (Czech)
* New translations activerecord.en.yml (Romanian)
* New translations activerecord.en.yml (French)
* New translations activerecord.en.yml (Spanish)
* New translations activerecord.en.yml (Afrikaans)
* New translations activerecord.en.yml (Arabic)
* New translations activerecord.en.yml (Bulgarian)
* New translations activerecord.en.yml (Armenian)
* New translations activerecord.en.yml (German)
* New translations activerecord.en.yml (Greek)
* New translations activerecord.en.yml (Frisian)
* New translations activerecord.en.yml (Basque)
* New translations activerecord.en.yml (Finnish)
* New translations activerecord.en.yml (Irish)
* New translations activerecord.en.yml (Hebrew)
* New translations activerecord.en.yml (Hungarian)
* New translations simple_form.en.yml (Ido)
* New translations simple_form.en.yml (Kabyle)
* New translations simple_form.en.yml (Standard Moroccan Tamazight)
* New translations simple_form.en.yml (Sardinian)
* New translations activerecord.en.yml (Indonesian)
* New translations activerecord.en.yml (Kurmanji (Kurdish))
* New translations activerecord.en.yml (Breton)
* New translations activerecord.en.yml (Persian)
* New translations activerecord.en.yml (Asturian)
* New translations activerecord.en.yml (Occitan)
* New translations activerecord.en.yml (Serbian (Latin))
* New translations activerecord.en.yml (Sorani (Kurdish))
* New translations activerecord.en.yml (Tatar)
* New translations activerecord.en.yml (Corsican)
* New translations en.yml (Burmese)
* New translations en.yml (Igbo)
* New translations activerecord.en.yml (Malayalam)
* New translations activerecord.en.yml (Sinhala)
* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)
* New translations activerecord.en.yml (Norwegian Nynorsk)
* New translations activerecord.en.yml (Tamil)
* New translations activerecord.en.yml (Spanish, Argentina)
* New translations activerecord.en.yml (Spanish, Mexico)
* New translations activerecord.en.yml (Bengali)
* New translations activerecord.en.yml (Marathi)
* New translations activerecord.en.yml (Thai)
* New translations activerecord.en.yml (Croatian)
* New translations activerecord.en.yml (Kazakh)
* New translations activerecord.en.yml (Estonian)
* New translations activerecord.en.yml (Latvian)
* New translations activerecord.en.yml (Hindi)
* New translations activerecord.en.yml (Welsh)
* New translations activerecord.en.yml (Sardinian)
* New translations activerecord.en.yml (Kabyle)
* New translations activerecord.en.yml (Ido)
* New translations activerecord.en.yml (Standard Moroccan Tamazight)
* New translations en.json (Afrikaans)
* New translations en.yml (Bulgarian)
* New translations en.json (Hungarian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.yml (Slovenian)
* New translations en.json (Swedish)
* New translations en.json (Chinese Simplified)
* New translations en.json (Vietnamese)
* New translations en.json (Icelandic)
* New translations en.json (Kurmanji (Kurdish))
* New translations simple_form.en.yml (Bulgarian)
* New translations doorkeeper.en.yml (Korean)
* New translations activerecord.en.yml (Bulgarian)
* New translations devise.en.yml (Bulgarian)
* New translations en.yml (German)
* New translations en.json (German)
* New translations en.json (Romanian)
* New translations en.json (Catalan)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations en.json (Norwegian)
* New translations en.json (Vietnamese)
* New translations en.json (Portuguese, Brazilian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Norwegian Nynorsk)
* New translations en.json (Latvian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Hebrew)
* New translations en.json (Arabic)
* New translations en.json (Catalan)
* New translations en.yml (Korean)
* New translations en.json (Turkish)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations simple_form.en.yml (Portuguese, Brazilian)
* New translations doorkeeper.en.yml (Portuguese, Brazilian)
* New translations devise.en.yml (Bulgarian)
* New translations en.json (Thai)
* New translations en.json (Bulgarian)
* New translations en.yml (Ukrainian)
* New translations en.json (Indonesian)
* New translations en.yml (Portuguese, Brazilian)
* New translations en.json (Scottish Gaelic)
* New translations en.json (Asturian)
* New translations en.json (German)
* New translations en.json (Portuguese)
* New translations en.json (Spanish)
* New translations en.json (Danish)
* New translations en.json (Ukrainian)
* New translations en.json (Tamil)
* New translations en.json (Chinese Traditional)
* New translations simple_form.en.yml (Occitan)
* New translations doorkeeper.en.yml (Occitan)
* New translations en.json (Norwegian)
* New translations en.json (Arabic)
* New translations en.yml (Arabic)
* New translations en.json (Korean)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Arabic)
* New translations en.json (Arabic)
* New translations en.json (Basque)
* New translations en.yml (Basque)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.yml (Esperanto)
* New translations simple_form.en.yml (Basque)
* New translations doorkeeper.en.yml (Esperanto)
* New translations en.json (Esperanto)
* New translations en.json (Norwegian)
* New translations en.yml (Norwegian)
* New translations en.json (Latvian)
* New translations simple_form.en.yml (Occitan)
* New translations devise.en.yml (Esperanto)
* New translations en.yml (Czech)
* New translations en.json (German)
* New translations en.json (Czech)
* New translations en.json (French)
* New translations en.yml (Hebrew)
* New translations en.json (Norwegian)
* New translations en.json (Irish)
* New translations en.yml (Dutch)
* New translations en.json (Ukrainian)
* New translations en.json (Romanian)
* New translations en.json (Russian)
* New translations en.json (Korean)
* New translations en.yml (Korean)
* New translations doorkeeper.en.yml (Korean)
* New translations doorkeeper.en.yml (Chinese Traditional)
* Run `yarn manage:translations`
* Run `bundle exec i18n-tasks normalize`
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
|
|
|
|
* fixes ArgumentError when proxy is used
* Update app/lib/request.rb
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
|
|
|
(#20408)
Regression from #20391
Fixes #20405
|
|
If `Nokogiri::HTML(value).at_xpath('//body')` fails to find the `body` element, it will return `nil`. We can guard against that with an early return. Avoids calling `children` on `Nilclass` in those cases.
|
|
(#20402)
|
|
* Cannot upload until login
* and do not fire upload
* change username props to context
|
|
Editing media metadata is not currently possible in edit mode, the button would
open the modal but saving the changes would error out.
|
|
|
|
|
|
(#20391)
|
|
The Blurhash library used by Mastodon requires an input encoded as 24
bits raw RGB data. The conversion to raw RGB using Imagemagick did not
previously specify the desired bit depth. In some situations, this leads
Imagemagick to output in a pixel format using less bpp than expected.
This then manifested as segfaults of the Sidekiq process due to
out-of-bounds read, or potentially a (highly noisy) memory infoleak.
Fixes #19235.
|
|
|
|
This prevents styling issues on the Authorization page.
|
|
See #20284
|
|
|
|
|
|
`:en` is English for both `standard_locale_name` and
`native_locale_name`, and so makes for a poor test candidate for
differentiating between them.
|
|
|
|
* Remove dead code
* Remove unneeded/broken parameters and refactor descendant computation
|
|
Fixes #20249
|
|
Fix #20242
|
|
ENABLE_STARTTLS is designed to replace ENABLE_STARTTLS_AUTO by accepting
three values: 'auto' (the default), 'always', and 'never'. If
ENABLE_STARTTLS isn't provided, we fall back to ENABLE_STARTTLS_AUTO. In
this way, this change should be fully backwards compatible.
Resolves #20311
|
|
|
|
(#20341)
|
|
* Update Helm chart README and comments in values.yaml
* Bump next Helm chart to 2.2.0
|
|
Fixes #20221
|
|
Fixes #20329
|