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
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
73b64b8917
Upgrade to Prettier 3 ( #25902 )
1 year ago
0d7340380c
Update dependency glob to v10.3.3 ( #25959 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
6be9f95a22
Update dependency core-js to v3.31.1 ( #25958 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
063482a63f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
1 year ago
1a6c2e450a
Update rubocop to v1.54.1 ( #25627 )
1 year ago
e7b0d1e23c
Update dependency chewy to v7.3.3 ( #25940 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
ce43ed144c
Rails 7.0 update ( #25668 )
1 year ago
bb98d970e3
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
c2bfbf53a1
Fix various CSS issues
1 year ago
8d0c69529a
Change markers API to use a replica ( #25851 )
1 year ago
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
1 year ago
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
ec95f62cb4
[Glitch] Fix sounds not being loaded from assets host
...
Port 1392f31ed8
1 year ago
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
15f6fa8d47
[Glitch] fix buttons showing inconsistent styles
...
Port ea10febd25
1 year ago
c3af91ce48
[Glitch] Fix filters not applying to explore tab
...
Port af54bf52c8
1 year ago
c699dc0908
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port c27b82a437
1 year ago
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
1 year ago
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
1 year ago
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
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
1 year ago
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
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
1 year ago
5b9e43187c
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port 20e85c0e83
1 year ago
55ea79165a
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 4534498a8e
1 year ago
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
1 year ago
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
1 year ago
67055b0343
Fix import order inconsistencies ( #2289 )
1 year ago
82e477b184
Update dependency capistrano-rails to v1.6.3 ( #25934 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
1ef014802b
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
1 year ago
ecd8e0d612
Update Stylelint ( #25819 )
1 year ago
be34b437ed
Update `haml-lint` ( #25929 )
1 year ago
f831452037
Refactor `Snowflake` to avoid brakeman sql injection warnings ( #25879 )
1 year ago
6c5a2233a8
Fix `RSpec/StubbedMock` cop ( #25552 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
2e1391fdd2
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
1 year ago
5134fc65e2
Fix `Naming/AccessorMethodName` cop ( #25924 )
1 year ago
b8b2470cf8
Fix `Style/SlicingWithRange` cop ( #25923 )
1 year ago
658742b3cd
Fix `Lint/AmbiguousBlockAssociation` cop ( #25921 )
1 year ago
b786911c55
Fix `Lint/SendWithMixinArgument` cop ( #25920 )
1 year ago
74806deb2c
Fix `RSpec/SubjectStub` cop ( #25550 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
7824df0eca
Exclude `lib/linter` from simplecov report ( #25916 )
1 year ago
c75df62ccc
Fix `RSpec/SubjectDeclaration` cop ( #25312 )
1 year ago
f134a5f9d8
Run Rubocop on Rakefile ( #23871 )
1 year ago
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
1 year ago
9e8bc56d5a
Enable Rubocop Style/Semicolon with config ( #23652 )
1 year ago
8e0fd2d619
Update babel monorepo ( #25930 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
1392f31ed8
Fix sounds not being loaded from assets host ( #25931 )
1 year ago
ca955ada0b
Use invariant colors on notification toasts ( #25919 )
1 year ago
Claire
Renaud Chaput
renovate[bot]
Michael Stanclift
Nick Schonning
Matt Jankowski
Eugen Rochko
Stanislas Signoud
Trevor Wolf
fusagiko / takayamaki
alfe