0aa69487a2
Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
Not a real conflict, upstream added a setting textually close to a glitch-soc one.
Added upstream's new setting.
- `config/routes.rb`:
Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
an extra route.
Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
This spec got converted to a system spec upstream.
However, the theme setting works differently in glitch-soc, so the spec had been
changed.
Changed the corresponding system spec as well.
2024-12-25 18:01:37 +01:00
b01e8f4a9b
Update dependency ioredis to v5.4.2 ( #33375 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-20 15:35:36 +00:00
fd0793dd0e
Update dependency postcss-preset-env to v10.1.2 ( #33303 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-16 07:47:32 +00:00
02e78a7dac
Update devDependencies (non-major) ( #33316 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-16 07:37:09 +00:00
a8edc82471
Replace deprecated "github" format for stylelint on CI runs ( #33292 )
2024-12-14 09:50:08 +00:00
ed33064e7b
Update dependency sass to v1.83.0 ( #33299 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-13 09:17:26 +00:00
6445facb8c
Update dependency react-select to v5.9.0 ( #33279 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-12 08:08:59 +00:00
32e23ef630
Update dependency react-redux to v9.2.0 ( #33260 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-11 08:17:47 +00:00
5e4ca0881e
Update dependency @rails/ujs to v7.1.501 ( #33258 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-11 07:55:14 +00:00
2e35b15b4d
Update dependency react-textarea-autosize to v8.5.6 ( #33228 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-09 15:12:31 +00:00
7b7a29867b
Update devDependencies (non-major) ( #33221 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-09 10:24:10 +00:00
96498a09c2
Update dependency @babel/preset-react to v7.26.3 ( #33174 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-06 15:21:12 +00:00
3ad45ced5e
Update dependency @dnd-kit/core to v6.3.1 ( #33194 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-06 15:20:36 +00:00
e35655cf55
Update dependency express to v4.21.2 ( #33195 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-06 15:20:19 +00:00
d58173e45b
Update dependency @dnd-kit/sortable to v10 ( #33183 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-05 09:12:21 +00:00
3708039856
Update dependency @dnd-kit/core to v6.3.0 ( #33181 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-05 09:12:08 +00:00
b9b26490e7
Update dependency sass to v1.82.0 ( #32411 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-04 10:40:47 +00:00
23a2366090
Update dependency dotenv to v16.4.7 ( #33147 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-04 10:20:50 +00:00
1cb303ca75
Update dependency axios to v1.7.9 ( #33168 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-04 09:12:26 +00:00
30c2a6c01c
Update dependency @rails/ujs to v7.1.500 ( #32648 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-03 15:53:36 +00:00
c2817c7fad
Merge commit '752d49eefef48262d501ba5fc2006d2c8466a000' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/feed_manager.rb`:
Upstream changed how notifications from follow subscriptions were handled,
refactoring this file in the process.
Conflict is due to glitch-soc having an extra timeline type (direct).
Ported upstream's changes.
- `app/workers/feed_insert_worker.rb`:
Ditto.
2024-12-02 21:08:15 +01:00
462e0717d6
Update devDependencies (non-major) ( #33126 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-12-02 08:11:22 +00:00
48827e1210
Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream
...
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
Minor conflict due to glitch-soc's theming system.
2024-12-01 17:36:49 +01:00
f0855fd41f
Update dependency axios to v1.7.8 ( #33075 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-26 08:10:19 +00:00
08914516d9
Update dependency postcss-preset-env to v10.1.1 ( #32947 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-26 08:09:34 +00:00
b702cd74f3
Update dependency @dnd-kit/core to v6.2.0 ( #33050 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-26 07:26:50 +00:00
72f623c391
Update dependency @dnd-kit/sortable to v9 ( #33051 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-26 07:26:47 +00:00
7fb0880e1e
Update dependency husky to v9.1.7 ( #33058 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-25 08:17:52 +00:00
6374937147
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
49a12a2df9
Update dependency @formatjs/cli to v6.3.11 ( #32950 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-18 08:57:37 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
44d92fa4f6
Update dependency uuid to v11.0.3 ( #32913 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-15 16:15:44 +00:00
54a7c1898e
Update dependency uuid to v11 ( #32676 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-15 15:55:10 +00:00
7fc8292ea5
Update dependency react-textarea-autosize to v8.5.5 ( #32872 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-13 15:08:10 +00:00
1f85ca2b0e
Update dependency react-select to v5.8.3 ( #32817 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-12 08:35:31 +00:00
88512220bb
Update dependency @formatjs/cli to v6.3.8 ( #32830 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-12 08:33:23 +00:00
90b5017c19
Update dependency postcss to v8.4.49 ( #32831 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-12 08:33:02 +00:00
67a2b03909
Update dependency postcss-preset-env to v10.1.0 ( #32835 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-12 08:32:43 +00:00
f0f807cec7
Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream
2024-11-10 13:18:43 +01:00
883b509988
Update dependency postcss-preset-env to v10.0.9 ( #32746 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-05 08:36:03 +00:00
823f597f00
Update formatjs monorepo ( #32764 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-04 09:20:13 +00:00
074fb04c6a
Update dependency utf-8-validate to v6.0.5 ( #32738 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-04 08:42:39 +00:00
f2763d978c
Update formatjs monorepo ( #32751 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-04 08:38:46 +00:00
1657106473
Update DefinitelyTyped types (non-major) ( #32760 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-04 08:38:32 +00:00
dfdc6b2871
Update devDependencies (non-major) ( #32761 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-11-04 08:38:20 +00:00
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
b3b3c0fe96
Update dependency core-js to v3.39.0 ( #32707 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-31 10:28:20 +00:00
110aa0aa28
Update workbox monorepo to v7.3.0 ( #32691 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-30 09:09:10 +00:00
cff1846f80
Update babel monorepo to v7.26.0 ( #32659 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-28 14:55:45 +00:00
6a5a59c28c
Update dependency @formatjs/cli to v6.3.5 ( #32675 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-10-28 13:21:24 +00:00
Claire