namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20858 commits 8 branches 15 tags 274 MiB
Commit graph

2368 commits

Author SHA1 Message Date
Claire
d2cfc6e5e2 Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream 2024-02-24 15:02:28 +01:00
Claire
ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 2024-02-24 14:46:14 +01:00
Claire
ab2f0daa10 Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-security.yml`:
  Changes were already cherry-picked and adapted in glitch-soc.
  Kept glitch-soc's version.
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
 2024-02-24 14:27:43 +01:00
Claire
5b9ddfcfcc Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream 2024-02-24 14:18:16 +01:00
Claire
c297d999ba Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream 2024-02-24 14:02:01 +01:00
Wojciech Maj
d908ed8e86 Remove unused dependencies (#29289) 2024-02-22 20:45:40 +01:00
Wojciech Maj
36fd47ac57
Remove unused dependencies (#29289) 2024-02-20 10:10:58 +00:00
renovate[bot]
e1cee84e58
Update dependency cocoon-js-vanilla to v1.4.0 (#29293) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-20 09:19:41 +00:00
renovate[bot]
fe6c055f35
Update dependency eslint-plugin-jsdoc to v48.1.0 (#29275) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-19 11:10:03 +00:00
renovate[bot]
e25d9dfb25
Update dependency dotenv to v16.4.3 (#29174) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-13 08:02:55 +00:00
renovate[bot]
819ede190e
Update dependency dotenv to v16.4.2 (#29157) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-12 10:39:31 +00:00
renovate[bot]
cf0d6bef8b
Update eslint (non-major) (#29166) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-12 10:21:17 +00:00
renovate[bot]
52986f35b8
Update dependency postcss to v8.4.35 (#29136) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-08 09:49:24 +00:00
renovate[bot]
dbafec88e5
Update dependency @reduxjs/toolkit to v2.1.0 (#28879) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-07 14:10:38 +00:00
renovate[bot]
a31427a629
Update dependency pino to v8.18.0 (#29043) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-06 11:33:06 +00:00
renovate[bot]
90f4b8d53a
Update dependency postcss to v8.4.34 (#29103) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-06 09:37:03 +00:00
renovate[bot]
916aeb574d
Update DefinitelyTyped types (non-major) (#29088) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-02-06 09:23:55 +00:00
renovate[bot]
0bc526a967
Update eslint (non-major) (#29001) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-30 15:39:59 +00:00
renovate[bot]
8c08e5cdb2
Update devDependencies (non-major) (#29000) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-30 15:39:34 +00:00
renovate[bot]
9d3830344f
Update dependency immutable to v4.3.5 (#28933) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-30 15:30:39 +00:00
Claire
5fa2821853 Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
renovate[bot]
87ad398ddc
Update formatjs monorepo (#28925) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-26 16:49:16 +00:00
renovate[bot]
f4a12adfb7
Update dependency axios to v1.6.7 (#28917) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-26 16:49:09 +00:00
renovate[bot]
160c8f4923
Update babel monorepo to v7.23.9 (#28916) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-26 16:49:03 +00:00
renovate[bot]
a69506a434
fix(deps): update dependency dotenv to v16.4.1 (#28889) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-25 12:37:23 +00:00
renovate[bot]
1a565e4bea
fix(deps): update dependency axios to v1.6.6 (#28895) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-25 12:36:20 +00:00
Claire
22cfab0ebf Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream 
Conflicts:
- `tsconfig.json`:
  Upstream made style fixes, while glitch-soc had extra options.
  Ported upstream's style fixes.
 2024-01-24 20:42:53 +01:00
renovate[bot]
7019af431d
fix(deps): update dependency dotenv to v16.4.0 (#28872) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-24 16:51:36 +00:00
renovate[bot]
61a0ec69fc
chore(deps): update devdependencies (non-major) (#28840) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-01-23 11:44:50 +00:00
Claire
102eff7c05 Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
Claire
0700eb58bc Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream 2024-01-22 19:12:05 +01:00
Claire
3cac826382 Merge commit '1335083bedd1dd563cfa9c54e69abc189ba3ec7b' into glitch-soc/merge-upstream 
Conflicts:
- `streaming/index.js`:
  Upstream significantly refactored that file, while one modified
  function had a different signature because of support for local-only
  posts.
  Ported upstream's change and kept the local-only support.
- `yarn.lock`:
  Upstream added new dependencies, one of which was textually close to
  a glitch-soc-only dependency.
  Updated accordingly.
 2024-01-22 19:01:35 +01:00
renovate[bot]
e078d0048c
Update dependency @types/react to v18.2.48 (#28839) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-22 11:08:22 +00:00
renovate[bot]
a83aeccac9
Update dependency dotenv to v16.3.2 (#28824) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-22 11:08:06 +00:00
renovate[bot]
9ff9849381
Update dependency core-js to v3.35.1 (#28831) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-22 11:07:44 +00:00
renovate[bot]
62001b5a31
Update dependency jsdom to v24 (#28836) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-22 11:04:28 +00:00
renovate[bot]
163db814c2
Update dependency react-redux to v9.1.0 (#28717) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-01-19 09:41:03 +00:00
renovate[bot]
6dc97321a3
Update dependency intl-messageformat to v10.5.10 (#28809) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-19 09:20:16 +00:00
Claire
528a8fa495 Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream 2024-01-18 22:16:16 +01:00
renovate[bot]
5ae3bae586
Update dependency sass to v1.70.0 (#28799) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-18 18:43:03 +00:00
Emelia Smith
1335083bed
Streaming: replace npmlog with pino & pino-http (#27828) 2024-01-18 18:40:25 +00:00
renovate[bot]
4c23297c04
Update dependency autoprefixer to v10.4.17 (#28794) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-18 09:33:21 +00:00
renovate[bot]
83a90f20d7
Update dependency async-mutex to v0.4.1 (#28797) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-18 09:31:59 +00:00
Claire
c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Conflict due to glitch-soc's option to hide followers count.
  Ported upstream changes.

Additional changes:
- `app/views/application/mailer/_account.html.haml`:
  Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
  Ported the `frontend_asset_url` helper change to glitch-soc.
 2024-01-17 18:32:15 +01:00
Claire
8485bedddc Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream 2024-01-17 18:09:15 +01:00
renovate[bot]
259874f2ac
Update dependency @rails/ujs to v7.1.3 (#28771) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-17 09:11:18 +00:00
renovate[bot]
bd538598c2
Update formatjs monorepo (#28751) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-16 18:34:53 +00:00
renovate[bot]
4e277f83dc
Update devDependencies (non-major) (#28728) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-01-16 18:34:22 +00:00
renovate[bot]
e85e2929aa
Update eslint (non-major) (#28729) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-01-16 17:53:32 +00:00
Claire
2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00