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
b229fa7916
Fix `Lint/AmbiguousBlockAssociation` cop ( #25921 )
1 year ago
4932925530
Fix `Lint/SendWithMixinArgument` cop ( #25920 )
1 year ago
a887e8bbd7
Fix `RSpec/SubjectStub` cop ( #25550 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
13a149dea6
Exclude `lib/linter` from simplecov report ( #25916 )
1 year ago
d9e56ef7ba
Fix `RSpec/SubjectDeclaration` cop ( #25312 )
1 year ago
226eaee2f2
Run Rubocop on Rakefile ( #23871 )
1 year ago
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
1 year ago
ca0ef39555
Enable Rubocop Style/Semicolon with config ( #23652 )
1 year ago
5ad5dcd563
Update babel monorepo ( #25930 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
1 year ago
d36859f37e
Use invariant colors on notification toasts ( #25919 )
1 year ago
9215676925
Fix incorrect syntax in Github action configuration ( #25918 )
1 year ago
dd7aaed762
Run the rebase conflict checker once an hour ( #25914 )
1 year ago
086ddcb021
Update brakeman ignores ( #25912 )
1 year ago
639c066a09
Run brakeman in GitHub Actions ( #23713 )
1 year ago
536232583b
Fix changelog referencing wrong API version ( #25857 )
1 year ago
e9312afa0d
Fixes `latest` Docker tag ( #25812 )
1 year ago
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
1 year ago
c6ac835588
Change searching with # to include account index ( #25638 )
1 year ago
047d44611b
Fix filters not applying to explore tab ( #25887 )
1 year ago
de3b86a5f8
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
1 year ago
2b174c0d78
Fix moderation interface for remote instances with a .zip TLD ( #25885 )
1 year ago
66693177ff
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
1 year ago
482071a976
Refactor `NotificationMailer` to use parameterization ( #25718 )
1 year ago
Claire
Stanislas Signoud
Trevor Wolf
Eugen Rochko
fusagiko / takayamaki
alfe
Renaud Chaput
renovate[bot]
Matt Jankowski
Nick Schonning
trwnh
jsgoldstein