c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
1 year ago
0e1d2e15a3
Merge pull request #2302 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
4207c95d4f
Fix haml-lint Rubocop `Style/SlicingWithRange` cop ( #25947 )
1 year ago
a442a1d1c6
Fix “Back” button sometimes redirecting out of Mastodon ( #25281 )
1 year ago
d0f00206dc
Fix haml-lint Rubocop `Style/StringLiterals` cop ( #25948 )
1 year ago
19208aa422
Migrate to request specs in `/api/v1/statuses/:status_id/favourite` ( #25626 )
1 year ago
6fb4a756ff
Migrate to request specs in `/api/v1/statuses/:status_id/bookmark` ( #25624 )
1 year ago
4859958a0c
Migrate to request specs in `/api/v1/polls` ( #25596 )
1 year ago
1aea938d3d
Migrate to request specs in `/api/v1/statuses/:status_id/pin` ( #25635 )
1 year ago
6cdc8408a9
Migrate to request specs in `/api/v1/emails/confirmations` ( #25686 )
1 year ago
8a1aabaac1
Migrate to request specs in `/api/v1/timelines/home` ( #25743 )
1 year ago
c80ecf2ff7
Increase PR Rebase job retries ( #25926 )
1 year ago
664b0ca8cb
Check if json body is null on Activitipub::ProcessingWorker ( #26021 )
1 year ago
bd33efdf16
Fix haml-lint Rubocop `Style/MinMaxComparison` cop ( #25974 )
1 year ago
361dd43235
Fix haml-lint Rubocop `lambda` cop ( #25946 )
1 year ago
5096deb818
Fix haml lint Rubocop `Style/RedundantStringCoercion` cop ( #25975 )
1 year ago
2a9063e36a
Update dependency react-select to v5.7.4 ( #26033 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
943f27f437
Remove unfollowed hashtag posts from home feed ( #26028 )
1 year ago
f18618d7f9
Fix some incorrect tests ( #26035 )
1 year ago
12e7f5fabd
[Glitch] Fix for "follows you" indicator in light web UI not readable
...
Port 97ce47e451
1 year ago
27f7e5b0f3
[Glitch] Prevent split line between icon and number on reposts & favourites
...
Port b923a4c755
1 year ago
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
626f9cf831
Update dependency public_suffix to v5.0.3 ( #26032 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
bf9c1a65fa
Update rubocop 1.54.2 ( #26002 )
1 year ago
cf18bfa090
Update dependency aws-sdk-s3 to v1.130.0 ( #25967 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
ee8c8dbc6f
remove some file paths from rubocop_tobo.yml ( #26022 )
1 year ago
7b7a26c895
Update dependency postcss to v8.4.26 ( #26030 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
c667fc5a4a
Fix ArgumentError in mailers when a user's timezone is blank ( #26025 )
1 year ago
97ce47e451
Fix for "follows you" indicator in light web UI not readable ( #25993 )
1 year ago
f17acbca33
Update dependency immutable to v4.3.1 ( #26029 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
cdaca7a08b
Update babel monorepo to v7.22.9 ( #26017 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
84ce94b100
Try to improve Renovatebot config ( #26005 )
1 year ago
26e522ac55
Fix not actually connecting to the configured replica ( #25977 )
1 year ago
23197cebce
Reduce dropdown menu margin and padding ( #2301 )
...
* Reduce dropdown menu margin and padding
* Change horizontal padding back to what it was
* Reduce separator vertical margins for consistency
1 year ago
b923a4c755
Prevent split line between icon and number on reposts & favourites ( #26004 )
1 year ago
2f6ac6b432
Merge pull request #2300 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
c45a965bf7
[Glitch] Change “About” and “Privacy policy” links to open in a new tab in advanced interface
...
Port 71db616fed
1 year ago
9bd012b7cb
[Glitch] Change links in multi-column mode so tabs are open in single-column mode
...
Port 5fad7bd58a
1 year ago
0d61985713
Remove layout glitch-soc settings
1 year ago
f0d3267fbf
[Glitch] Fix dropdowns being disabled for logged out users in web UI
...
Port a8edbcf963
1 year ago
a98b5c2246
[Glitch] Fix embed dropdown menu item for unauthenticated users
...
Port 41f65edb21
1 year ago
d9adda1a99
Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream
1 year ago
a0047184d7
Add eslint rule to forbid vanilla imports in glitch ( #2293 )
...
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
1 year ago
470ded3687
Fix notifications not loading when slow mode active ( #2292 )
...
When slow mode is enabled, clicking a notification filter when a new notification was received will render an empty column.
This change has been missed in e91bf82083
1 year ago
3952d17518
Merge pull request #2296 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
e271d018b7
Fix home timeline's regexp field
1 year ago
71db616fed
Change “About” and “Privacy policy” links to open in a new tab in advanced interface ( #25973 )
1 year ago
5fad7bd58a
Change links in multi-column mode so tabs are open in single-column mode ( #25893 )
1 year ago
41f65edb21
Fix embed dropdown menu item for unauthenticated users ( #25964 )
1 year ago
644c5fddd8
Refactor `Status.tagged_with_all` for brakeman SQL injection warning ( #25941 )
1 year ago
Claire
Matt Jankowski
Daniel M Brasil
Nick Schonning
Jeong Arm
renovate[bot]
Michael Stanclift
Terence Eden
fusagiko / takayamaki
Renaud Chaput
Eugen Rochko
Stanislas Signoud
Plastikmensch