~cytrogen/masto-fe

2126812f — Claire 2 years ago
Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
128daefc — Claire 2 years ago
Remove leftover `.orig` files that were mistakenly included (#2379)

4f1d2262 — Claire 2 years ago
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714
724d7738 — mogaminsk 2 years ago
[Glitch] Fix "Create Account" button in interaction modal

Port a664e1570242c98abcfd7d74e78473bdb8b85587 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
7e25e311 — Claire 2 years ago
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
d9c21293 — Claire 2 years ago
Fix unfollow icon styling in advanced column (#26482)

dd049fc3 — Claire 2 years ago
Fix ES_PRESET not being applied to Chewy's internal index (#26489)

90ec88d5 — Claire 2 years ago
Add support for `indexable` attribute on remote actors (#26485)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
fc5ab2dc — Claire 2 years ago
Add privacy tab in profile settings (#26484)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
3a8370e1 — Claire 2 years ago
Fix `repo:changelog` task matching strings that are not Pull Request identifiers (#26280)

f5778caa — Claire 2 years ago
Add `ES_PRESET` option to customize numbers of shards and replicas (#26483)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
c452ccd9 — github-actions[bot] 2 years ago
New Crowdin Translations (automated) (#26444)

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
9262cfc5 — Renaud Chaput 2 years ago
Fix `lint:json` not processing `json5` extension (#26481)

07f43daa — renovate[bot] 2 years ago
Update dependency nokogiri to v1.15.4 (#26476)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c65032fb — renovate[bot] 2 years ago
Update dependency autoprefixer to v10.4.15 (#26473)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
273730c4 — renovate[bot] 2 years ago
Update dependency faker to v3.2.1 (#26474)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
c48506d8 — HonkingGoose 2 years ago
Improve Renovate configuration (#26306)

a664e157 — mogaminsk 2 years ago
Fix "Create Account" button in interaction modal (#26459)

1eac3a60 — Renaud Chaput 2 years ago
Upgrade `@types/react` (#26457)

8c7f3c53 — Claire 2 years ago
Remove old non-unique index on preview_cards statuses join table (#26447)

Next