ce43ed144c
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
bb98d970e3
Merge pull request #2291 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-12 22:17:29 +02:00
c2bfbf53a1
Fix various CSS issues
2023-07-12 19:13:31 +02:00
8d0c69529a
Change markers API to use a replica ( #25851 )
2023-07-12 18:57:40 +02:00
fdc3ff7c2d
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
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.
2023-07-12 16:03:05 +02:00
ec95f62cb4
[Glitch] Fix sounds not being loaded from assets host
...
Port 1392f31ed8
2023-07-12 16:00:20 +02:00
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
2023-07-12 15:54:58 +02:00
15f6fa8d47
[Glitch] fix buttons showing inconsistent styles
...
Port ea10febd25
2023-07-12 15:50:56 +02:00
c3af91ce48
[Glitch] Fix filters not applying to explore tab
...
Port af54bf52c8
2023-07-12 15:48:13 +02:00
c699dc0908
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port c27b82a437
2023-07-12 15:47:43 +02:00
075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
2023-07-12 15:43:10 +02:00
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.
2023-07-12 15:38:35 +02:00
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
2023-07-12 15:34:12 +02:00
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.
2023-07-12 15:27:32 +02:00
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
2023-07-12 15:18:41 +02:00
5b9e43187c
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port 20e85c0e83
2023-07-12 15:17:18 +02:00
55ea79165a
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 4534498a8e
2023-07-12 15:09:14 +02:00
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
2023-07-12 15:05:24 +02:00
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
67055b0343
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
82e477b184
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
1ef014802b
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
ecd8e0d612
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
be34b437ed
Update `haml-lint` ( #25929 )
2023-07-12 12:31:10 +02:00
f831452037
Refactor `Snowflake` to avoid brakeman sql injection warnings ( #25879 )
2023-07-12 10:44:58 +02:00
6c5a2233a8
Fix `RSpec/StubbedMock` cop ( #25552 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:20:10 +02:00
2e1391fdd2
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
2023-07-12 10:08:51 +02:00
5134fc65e2
Fix `Naming/AccessorMethodName` cop ( #25924 )
2023-07-12 10:03:19 +02:00
b8b2470cf8
Fix `Style/SlicingWithRange` cop ( #25923 )
2023-07-12 10:03:06 +02:00
658742b3cd
Fix `Lint/AmbiguousBlockAssociation` cop ( #25921 )
2023-07-12 10:02:41 +02:00
b786911c55
Fix `Lint/SendWithMixinArgument` cop ( #25920 )
2023-07-12 10:02:32 +02:00
74806deb2c
Fix `RSpec/SubjectStub` cop ( #25550 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 10:02:19 +02:00
7824df0eca
Exclude `lib/linter` from simplecov report ( #25916 )
2023-07-12 09:51:59 +02:00
c75df62ccc
Fix `RSpec/SubjectDeclaration` cop ( #25312 )
2023-07-12 09:49:33 +02:00
f134a5f9d8
Run Rubocop on Rakefile ( #23871 )
2023-07-12 09:47:54 +02:00
1d557305d2
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
9e8bc56d5a
Enable Rubocop Style/Semicolon with config ( #23652 )
2023-07-12 09:44:15 +02:00
8e0fd2d619
Update babel monorepo ( #25930 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-12 09:05:17 +02:00
1392f31ed8
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
ca955ada0b
Use invariant colors on notification toasts ( #25919 )
2023-07-11 23:30:21 +02:00
3b92499cbc
Fix incorrect syntax in Github action configuration ( #25918 )
2023-07-11 19:52:37 +02:00
a02ae37766
Run the rebase conflict checker once an hour ( #25914 )
2023-07-11 19:40:51 +02:00
9411fa4d36
Update brakeman ignores ( #25912 )
2023-07-11 17:08:37 +02:00
e11032585b
Run brakeman in GitHub Actions ( #23713 )
2023-07-11 15:23:57 +02:00
3aa153694e
Fix changelog referencing wrong API version ( #25857 )
2023-07-11 14:53:58 +02:00
518890a9f1
Fixes `latest` Docker tag ( #25812 )
2023-07-11 14:52:00 +02:00
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
99be47f8b9
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
Matt Jankowski