90a0f97140
Fix incorrect types in DisplayName
1 year ago
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
1 year ago
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
1 year ago
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
1 year ago
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
1 year ago
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
1 year ago
c6212d89f8
Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
1 year ago
fc6d89573c
Fix follow link style in embeds ( #25965 )
1 year ago
725b27379e
Update dependency postcss to v8.4.25 ( #25961 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
7ca72cab0e
Update dependency react-textarea-autosize to v8.5.2 ( #25962 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
a09ed92a77
Upgrade to `typescript-eslint` v6 ( #25904 )
1 year ago
789459cea3
Update dependency rubocop-rails to v2.20.1 ( #25493 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
1 year ago
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
1 year ago
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
1 year ago
9e6c02fd81
Update dependency glob to v10.3.3 ( #25959 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
31519eee55
Update dependency core-js to v3.31.1 ( #25958 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
9e5862608f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
1 year ago
1b1f9dff10
Update rubocop to v1.54.1 ( #25627 )
1 year ago
1a3d7c7e65
Update dependency chewy to v7.3.3 ( #25940 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
5cdc196e44
Rails 7.0 update ( #25668 )
1 year ago
bb61faa64b
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
bd06bdf164
Fix various CSS issues
1 year ago
8bc36b5084
Change markers API to use a replica ( #25851 )
1 year ago
315002c1be
Change notifications API to use a replica ( #25874 )
1 year ago
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
1 year ago
3890b5c5fd
[Glitch] Fix sounds not being loaded from assets host
...
Port 01b9ee2b81
1 year ago
9af6f6db1a
Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
1 year ago
7e3d2d3b4f
[Glitch] fix buttons showing inconsistent styles
...
Port 29c29410d2
1 year ago
05c57b674f
[Glitch] Fix filters not applying to explore tab
...
Port 047d44611b
1 year ago
e91c424b7c
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port 66693177ff
1 year ago
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
1 year ago
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
1 year ago
54b6b035a7
Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
1 year ago
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
1 year ago
63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
1 year ago
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
1 year ago
4781c1f7eb
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port b5c5e2bf36
1 year ago
5a6f556541
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 9203ab410c
1 year ago
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
1 year ago
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
1 year ago
a64181f28b
Fix import order inconsistencies ( #2289 )
1 year ago
6ee7c03b28
Update dependency capistrano-rails to v1.6.3 ( #25934 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
1b1ecf8ee2
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
1 year ago
8d20afe0aa
Update Stylelint ( #25819 )
1 year ago
e0d0e7c113
Update `haml-lint` ( #25929 )
1 year ago
034a6a0dd4
Refactor `Snowflake` to avoid brakeman sql injection warnings ( #25879 )
1 year ago
93cbe2a0e4
Fix `RSpec/StubbedMock` cop ( #25552 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
08421e7b90
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
1 year ago
399a738c85
Fix `Naming/AccessorMethodName` cop ( #25924 )
1 year ago
d98717ceef
Fix `Style/SlicingWithRange` cop ( #25923 )
1 year ago
Claire
Renaud Chaput
renovate[bot]
Michael Stanclift
Nick Schonning
Matt Jankowski
Eugen Rochko
Stanislas Signoud
Trevor Wolf
fusagiko / takayamaki
alfe