Kouhai
|
27f74617cc
|
th: Merge remote-tracking branch 'glitch/main' (915cd36ac1)
|
9 months ago |
Claire
|
915cd36ac1
|
Merge pull request #2579 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to f866413e72
|
10 months ago |
|
Claire
|
528a8fa495
|
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
|
10 months ago |
|
Claire
|
07b6777c99
|
Fix styling issue in account fields (#2578)
|
10 months ago |
|
Claire
|
d80d8f6bb9
|
Merge pull request #2577 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 127503eb2c
|
10 months ago |
Matt Jankowski
|
f866413e72
|
Extract shared tagged statuses method in `FeaturedTag` (#28805)
|
10 months ago |
|
Matt Jankowski
|
f0b93ab02f
|
Use AR `database_version` in PG version checks in migrations (#28804)
|
10 months ago |
|
Matt Jankowski
|
d0b3bc23d7
|
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock (#28803)
|
10 months ago |
|
Matt Jankowski
|
0b853678a4
|
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope (#28796)
|
10 months ago |
|
Matt Jankowski
|
2115bc52e4
|
Order by sql in `CLI::Maintenance` task (#28289)
|
10 months ago |
|
Matt Jankowski
|
9fb9ef418a
|
Fix `Rails/WhereExists` cop in User model (#28792)
|
10 months ago |
|
Matt Jankowski
|
81e4e65610
|
Update links to upstream migration helpers, remove unused methods (#28781)
|
10 months ago |
|
Matt Jankowski
|
aaa6f2e930
|
Group common `class_name` options in associations (#28779)
|
10 months ago |
|
Matt Jankowski
|
da31792ac7
|
Fix `Rails/WhereExists` cop in FeaturedTag model (#28791)
|
10 months ago |
|
Matt Jankowski
|
3d82040b26
|
Reduced repeated setup in `UnallowDomainService` spec (#28785)
|
10 months ago |
|
Matt Jankowski
|
6c5a2d51bc
|
Reduced repeated setup in `PurgeDomainService` spec (#28786)
|
10 months ago |
|
Matt Jankowski
|
07e10e3747
|
Combine assertions about same setup in `Account#suspend!` spec (#28787)
|
10 months ago |
|
Matt Jankowski
|
89c9a4502d
|
Fix `Rails/WhereExists` cop in account/interactions concern (#28789)
|
10 months ago |
renovate[bot]
|
4c23297c04
|
Update dependency autoprefixer to v10.4.17 (#28794)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
|
renovate[bot]
|
83a90f20d7
|
Update dependency async-mutex to v0.4.1 (#28797)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
Santiago Kozak
|
036e25f19d
|
[Glitch] Improve display of lock icon in account headers
Port 30b193b856 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Claire
|
0207c4b055
|
[Glitch] Change media “ALT” label to a specific class
Port e817fe4c35 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Claire
|
e8294925e6
|
[Glitch] Fix various icon alignment issues
Port baab58c80b to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Claire
|
c59fb65ddc
|
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
|
10 months ago |
|
renovate[bot]
|
d56e9fb873
|
[Glitch] Update devDependencies (non-major)
Port 4e277f83dc to glitch-soc
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Claire
|
8485bedddc
|
Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream
|
10 months ago |
|
Matt Jankowski
|
127503eb2c
|
Fix `Rails/RakeEnvironment` cop (#28782)
|
10 months ago |
|
Santiago Kozak
|
30b193b856
|
Improve display of lock icon in account headers (#28780)
|
10 months ago |
|
Matt Jankowski
|
09f76c5c8d
|
Regenerate rubocop todo, removes last `Layout/LineLength` violation (#28778)
|
10 months ago |
|
Claire
|
e817fe4c35
|
Change media “ALT” label to a specific class (#28777)
|
10 months ago |
HTeuMeuLeu
|
1a3859d8e2
|
Update follow and follow_request emails (#28755)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Matt Jankowski
|
6fab50ba9e
|
Use bundler version 2.5.4 (#28765)
|
10 months ago |
github-actions[bot]
|
1ab42ad12b
|
New Crowdin Translations (automated) (#28749)
Co-authored-by: GitHub Actions <noreply@github.com>
|
10 months ago |
|
Matt Jankowski
|
9a475ea8b3
|
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs (#28764)
|
10 months ago |
Renaud Chaput
|
cb5ac15923
|
Use a helper to avoid using `media/` asset prefixes (#28756)
|
10 months ago |
|
Claire
|
baab58c80b
|
Fix various icon alignment issues (#28775)
|
10 months ago |
|
Matt Jankowski
|
c523a9601b
|
Rename local webpack* var in development env CSP config (#28766)
|
10 months ago |
|
Matt Jankowski
|
1b0cb3b54d
|
Announcement reactions query spec improvement and refactor (#28768)
|
10 months ago |
|
renovate[bot]
|
afb5e6cf46
|
Update dependency rails to v7.1.3 (#28772)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
|
renovate[bot]
|
259874f2ac
|
Update dependency @rails/ujs to v7.1.3 (#28771)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
|
Matt Jankowski
|
0ce081fe49
|
Remove monkey patch in favor of supported Devise config value (#28760)
|
10 months ago |
|
renovate[bot]
|
8cc322a0e1
|
Update dependency concurrent-ruby to v1.2.3 (#28754)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
|
renovate[bot]
|
bd538598c2
|
Update formatjs monorepo (#28751)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
|
renovate[bot]
|
4e277f83dc
|
Update devDependencies (non-major) (#28728)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
|
10 months ago |
|
renovate[bot]
|
e85e2929aa
|
Update eslint (non-major) (#28729)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
10 months ago |
Jeong Arm
|
411efdc2d3
|
Fix getting started misc column on dev env (#2575)
* Fix getting started misc column on dev
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Claire
|
1fa9da1f39
|
Merge pull request #2573 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes up to 01b6c83c36
|
10 months ago |
|
Renaud Chaput
|
5b67389bba
|
[Glitch] Add a new `@/` alias for the root frontend directory and use it where possible
Port 01b6c83c36 to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
|
10 months ago |
|
Claire
|
e4d07c7bcc
|
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
|
10 months ago |
|
Renaud Chaput
|
01b6c83c36
|
Add a new `@/` alias for the root frontend directory and use it where possible (#28753)
|
10 months ago |
