3cac826382
Merge commit '1335083bedd1dd563cfa9c54e69abc189ba3ec7b' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream significantly refactored that file, while one modified
function had a different signature because of support for local-only
posts.
Ported upstream's change and kept the local-only support.
- `yarn.lock`:
Upstream added new dependencies, one of which was textually close to
a glitch-soc-only dependency.
Updated accordingly.
2024-01-22 19:01:35 +01:00
915cd36ac1
Merge pull request #2579 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to f866413e72
2024-01-19 12:09:01 +01:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
07b6777c99
Fix styling issue in account fields ( #2578 )
2024-01-18 20:27:47 +01:00
d80d8f6bb9
Merge pull request #2577 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 127503eb2c
2024-01-18 20:27:31 +01:00
1335083bed
Streaming: replace npmlog with pino & pino-http ( #27828 )
2024-01-18 18:40:25 +00:00
f866413e72
Extract shared tagged statuses method in `FeaturedTag` ( #28805 )
2024-01-18 16:14:15 +00:00
f0b93ab02f
Use AR `database_version` in PG version checks in migrations ( #28804 )
2024-01-18 16:11:50 +00:00
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00:00
0b853678a4
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope ( #28796 )
2024-01-18 15:57:10 +00:00
2115bc52e4
Order by sql in `CLI::Maintenance` task ( #28289 )
2024-01-18 14:53:29 +00:00
9fb9ef418a
Fix `Rails/WhereExists` cop in User model ( #28792 )
2024-01-18 13:55:44 +00:00
81e4e65610
Update links to upstream migration helpers, remove unused methods ( #28781 )
2024-01-18 12:29:54 +00:00
aaa6f2e930
Group common `class_name` options in associations ( #28779 )
2024-01-18 12:29:41 +00:00
da31792ac7
Fix `Rails/WhereExists` cop in FeaturedTag model ( #28791 )
2024-01-18 12:22:12 +00:00
3d82040b26
Reduced repeated setup in `UnallowDomainService` spec ( #28785 )
2024-01-18 10:11:10 +00:00
6c5a2d51bc
Reduced repeated setup in `PurgeDomainService` spec ( #28786 )
2024-01-18 10:07:49 +00:00
07e10e3747
Combine assertions about same setup in `Account#suspend!` spec ( #28787 )
2024-01-18 09:36:59 +00:00
89c9a4502d
Fix `Rails/WhereExists` cop in account/interactions concern ( #28789 )
2024-01-18 09:36:16 +00:00
4c23297c04
Update dependency autoprefixer to v10.4.17 ( #28794 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-18 09:33:21 +00:00
83a90f20d7
Update dependency async-mutex to v0.4.1 ( #28797 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-18 09:31:59 +00:00
036e25f19d
[Glitch] Improve display of lock icon in account headers
...
Port 30b193b856
2024-01-17 18:37:04 +01:00
0207c4b055
[Glitch] Change media “ALT” label to a specific class
...
Port e817fe4c35
2024-01-17 18:36:09 +01:00
e8294925e6
[Glitch] Fix various icon alignment issues
...
Port baab58c80b
2024-01-17 18:34:57 +01:00
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.
2024-01-17 18:32:15 +01:00
d56e9fb873
[Glitch] Update devDependencies (non-major)
...
Port 4e277f83dc
2024-01-17 18:12:00 +01:00
8485bedddc
Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream
2024-01-17 18:09:15 +01:00
127503eb2c
Fix `Rails/RakeEnvironment` cop ( #28782 )
2024-01-17 16:33:17 +00:00
30b193b856
Improve display of lock icon in account headers ( #28780 )
2024-01-17 16:32:30 +00:00
09f76c5c8d
Regenerate rubocop todo, removes last `Layout/LineLength` violation ( #28778 )
2024-01-17 15:42:13 +00:00
e817fe4c35
Change media “ALT” label to a specific class ( #28777 )
2024-01-17 15:32:56 +00:00
1a3859d8e2
Update follow and follow_request emails ( #28755 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 14:37:04 +00:00
6fab50ba9e
Use bundler version 2.5.4 ( #28765 )
2024-01-17 14:35:55 +00:00
1ab42ad12b
New Crowdin Translations (automated) ( #28749 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-17 14:23:14 +00:00
9a475ea8b3
Finish up the CLI spec area pattern adoption for `CLI::Accounts#refresh` specs ( #28764 )
2024-01-17 13:38:37 +00:00
cb5ac15923
Use a helper to avoid using `media/` asset prefixes ( #28756 )
2024-01-17 12:19:51 +00:00
baab58c80b
Fix various icon alignment issues ( #28775 )
2024-01-17 10:42:47 +00:00
c523a9601b
Rename local webpack* var in development env CSP config ( #28766 )
2024-01-17 09:22:16 +00:00
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
afb5e6cf46
Update dependency rails to v7.1.3 ( #28772 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-17 09:11:22 +00:00
259874f2ac
Update dependency @rails/ujs to v7.1.3 ( #28771 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-17 09:11:18 +00:00
0ce081fe49
Remove monkey patch in favor of supported Devise config value ( #28760 )
2024-01-17 09:08:17 +00:00
8cc322a0e1
Update dependency concurrent-ruby to v1.2.3 ( #28754 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-17 09:06:38 +00:00
bd538598c2
Update formatjs monorepo ( #28751 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-16 18:34:53 +00:00
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>
2024-01-16 18:34:22 +00:00
e85e2929aa
Update eslint (non-major) ( #28729 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-16 17:53:32 +00:00
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>
2024-01-16 17:40:03 +01:00
1fa9da1f39
Merge pull request #2573 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 01b6c83c36
2024-01-16 17:18:26 +01:00
5b67389bba
[Glitch] Add a new `@/` alias for the root frontend directory and use it where possible
...
Port 01b6c83c36
2024-01-16 12:21:13 +01:00
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
2024-01-16 12:04:11 +01:00
Claire