Claire
95a1fde6b6
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' 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
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' 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
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 ( #25902 )
1 year ago
Michael Stanclift
063482a63f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
1 year ago
Nick Schonning
1a6c2e450a
Update rubocop to v1.54.1 ( #25627 )
1 year ago
Matt Jankowski
ce43ed144c
Rails 7.0 update ( #25668 )
1 year ago
Claire
c2bfbf53a1
Fix various CSS issues
1 year ago
Eugen Rochko
8d0c69529a
Change markers API to use a replica ( #25851 )
1 year ago
Eugen Rochko
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
1 year ago
Claire
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' 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
Stanislas Signoud
ec95f62cb4
[Glitch] Fix sounds not being loaded from assets host
...
Port 1392f31ed8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
2aadebc769
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' 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
Trevor Wolf
15f6fa8d47
[Glitch] fix buttons showing inconsistent styles
...
Port ea10febd25
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
c3af91ce48
[Glitch] Fix filters not applying to explore tab
...
Port af54bf52c8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
c699dc0908
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port c27b82a437
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
1 year ago
Eugen Rochko
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
dd0002e1fe
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' 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
Eugen Rochko
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' 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
fusagiko / takayamaki
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
alfe
5b9e43187c
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port 20e85c0e83
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Renaud Chaput
55ea79165a
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 4534498a8e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Renaud Chaput
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
1 year ago
Claire
67055b0343
Fix import order inconsistencies ( #2289 )
1 year ago
Matt Jankowski
1ef014802b
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
1 year ago
Renaud Chaput
ecd8e0d612
Update Stylelint ( #25819 )
1 year ago
Matt Jankowski
2e1391fdd2
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
1 year ago
Matt Jankowski
5134fc65e2
Fix `Naming/AccessorMethodName` cop ( #25924 )
1 year ago
Matt Jankowski
b8b2470cf8
Fix `Style/SlicingWithRange` cop ( #25923 )
1 year ago
Nick Schonning
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
1 year ago
Stanislas Signoud
1392f31ed8
Fix sounds not being loaded from assets host ( #25931 )
1 year ago
Stanislas Signoud
ca955ada0b
Use invariant colors on notification toasts ( #25919 )
1 year ago
Trevor Wolf
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
1 year ago
jsgoldstein
99be47f8b9
Change searching with # to include account index ( #25638 )
1 year ago
Claire
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
1 year ago
Claire
999c343946
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
1 year ago
Claire
c27b82a437
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
1 year ago
Matt Jankowski
f3fca78756
Refactor `NotificationMailer` to use parameterization ( #25718 )
1 year ago
Eugen Rochko
a1f5188c8c
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
1 year ago
Eugen Rochko
610cf6c371
Fix trend calculation working on too many items at a time ( #25835 )
1 year ago
Eugen Rochko
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
1 year ago
Matt Jankowski
cf33028f35
Admin mailer parameterization ( #25759 )
1 year ago
Renaud Chaput
41a505513f
Remove unused `missed_update` state ( #25832 )
1 year ago
Eugen Rochko
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
1 year ago
Eugen Rochko
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
1 year ago
Eugen Rochko
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
1 year ago
Eugen Rochko
93e8a15415
Add forwarding of reported replies to servers being replied to ( #25341 )
1 year ago
Kurtis Rainbolt-Greene
e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
1 year ago