Claire
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
2023-07-13 14:01:40 +02:00
Claire
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.
2023-07-13 13:49:58 +02:00
Claire
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`.
2023-07-13 13:35:15 +02:00
Renaud Chaput
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
renovate[bot]
9e6c02fd81
Update dependency glob to v10.3.3 ( #25959 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 11:20:20 +02:00
renovate[bot]
31519eee55
Update dependency core-js to v3.31.1 ( #25958 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 11:17:46 +02:00
Michael Stanclift
9e5862608f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
2023-07-13 11:12:51 +02:00
Nick Schonning
1b1f9dff10
Update rubocop to v1.54.1 ( #25627 )
2023-07-13 11:11:55 +02:00
renovate[bot]
1a3d7c7e65
Update dependency chewy to v7.3.3 ( #25940 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 11:07:26 +02:00
Matt Jankowski
5cdc196e44
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
Claire
bb61faa64b
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-12 22:17:29 +02:00
Claire
bd06bdf164
Fix various CSS issues
2023-07-12 19:13:31 +02:00
Eugen Rochko
8bc36b5084
Change markers API to use a replica ( #25851 )
2023-07-12 18:57:40 +02:00
Eugen Rochko
315002c1be
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
Claire
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.
2023-07-12 16:03:05 +02:00
Stanislas Signoud
3890b5c5fd
[Glitch] Fix sounds not being loaded from assets host
...
Port 01b9ee2b81
2023-07-12 16:00:20 +02:00
Claire
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
2023-07-12 15:54:58 +02:00
Trevor Wolf
7e3d2d3b4f
[Glitch] fix buttons showing inconsistent styles
...
Port 29c29410d2
2023-07-12 15:50:56 +02:00
Claire
05c57b674f
[Glitch] Fix filters not applying to explore tab
...
Port 047d44611b
2023-07-12 15:48:13 +02:00
Claire
e91c424b7c
[Glitch] Add forward_to_domains parameter to POST /api/v1/reports
...
Port 66693177ff
2023-07-12 15:47:43 +02:00
Claire
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
Eugen Rochko
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
2023-07-12 15:43:10 +02:00
Claire
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.
2023-07-12 15:38:35 +02:00
Eugen Rochko
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
2023-07-12 15:34:12 +02:00
Claire
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.
2023-07-12 15:27:32 +02:00
fusagiko / takayamaki
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
2023-07-12 15:18:41 +02:00
alfe
4781c1f7eb
[Glitch] Rewrite <ShortNumber /> as FC and TS
...
Port b5c5e2bf36
2023-07-12 15:17:18 +02:00
Renaud Chaput
5a6f556541
[Glitch] Convert <DismissableBanner> to Typescript
...
Port 9203ab410c
2023-07-12 15:09:14 +02:00
Renaud Chaput
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
2023-07-12 15:05:24 +02:00
Claire
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
a64181f28b
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
renovate[bot]
6ee7c03b28
Update dependency capistrano-rails to v1.6.3 ( #25934 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-12 14:19:51 +02:00
Matt Jankowski
1b1ecf8ee2
Refactor Trends::Query to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
Renaud Chaput
8d20afe0aa
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
Renaud Chaput
e0d0e7c113
Update haml-lint ( #25929 )
2023-07-12 12:31:10 +02:00
Matt Jankowski
034a6a0dd4
Refactor Snowflake to avoid brakeman sql injection warnings ( #25879 )
2023-07-12 10:44:58 +02:00
Matt Jankowski
93cbe2a0e4
Fix RSpec/StubbedMock cop ( #25552 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:20:10 +02:00
Matt Jankowski
08421e7b90
Fix Naming/MemoizedInstanceVariableName cop ( #25928 )
2023-07-12 10:08:51 +02:00
Matt Jankowski
399a738c85
Fix Naming/AccessorMethodName cop ( #25924 )
2023-07-12 10:03:19 +02:00
Matt Jankowski
d98717ceef
Fix Style/SlicingWithRange cop ( #25923 )
2023-07-12 10:03:06 +02:00
Matt Jankowski
b229fa7916
Fix Lint/AmbiguousBlockAssociation cop ( #25921 )
2023-07-12 10:02:41 +02:00
Matt Jankowski
4932925530
Fix Lint/SendWithMixinArgument cop ( #25920 )
2023-07-12 10:02:32 +02:00
Matt Jankowski
a887e8bbd7
Fix RSpec/SubjectStub cop ( #25550 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:02:19 +02:00
Matt Jankowski
13a149dea6
Exclude lib/linter from simplecov report ( #25916 )
2023-07-12 09:51:59 +02:00
Matt Jankowski
d9e56ef7ba
Fix RSpec/SubjectDeclaration cop ( #25312 )
2023-07-12 09:49:33 +02:00
Nick Schonning
226eaee2f2
Run Rubocop on Rakefile ( #23871 )
2023-07-12 09:47:54 +02:00
Nick Schonning
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
Nick Schonning
ca0ef39555
Enable Rubocop Style/Semicolon with config ( #23652 )
2023-07-12 09:44:15 +02:00
renovate[bot]
5ad5dcd563
Update babel monorepo ( #25930 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-12 09:05:17 +02:00
Stanislas Signoud
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
