me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18461 commits 2 branches 0 tags 429 MiB
Commit graph

18461 commits

This branch
This branch
All branches
Author SHA1 Message Date
Renaud Chaput
b428d82286 [Glitch] Upgrade react-intl 
Port 76960f128a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-10 14:37:08 +02:00
Claire
c22b032483 Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, but we've deleted it.
  Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
  Reworked upstream, but the code was mostly in
  `app/javascript/locales/index.js` in glitch-soc.
  Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
  Conflict due to locales loading and theme system
  discrepancies.
  Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
  Deleted upstream, as upstream now directly loads the
  JSON at runtime.
  Deleted as well, will switch to runtime loading in
  an upcoming commit.
- `config/webpack/shared.js`:
  Not a real conflict, but different imports in
  glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
  Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
  instead.
  Moved the glitch-soc logic there and deleted the file.
 2023-06-10 12:38:33 +02:00
Eugen Rochko
1dd243cc09 Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
Emelia Smith
bc7e7185ac Fix performance of streaming by parsing message JSON once (#25278) 2023-06-09 19:29:16 +02:00
Renaud Chaput
d4abb4e41f Add Ruby & Bundler versions to Gemfile.lock (#25317) 2023-06-09 16:34:36 +02:00
Matt Jankowski
8b5680fd9a Remove unused redis_info method Admin::Dashboard (#25345) 2023-06-09 14:03:35 +02:00
Daniel M Brasil
14fa204dfc Migrate to request specs in /api/v1/admin/email_domain_blocks (#25337) 2023-06-09 14:00:14 +02:00
jsgoldstein
975914e0a6 Fix translations for changing theme (#25340) 2023-06-08 17:12:41 +02:00
Matt Jankowski
68d362c0fc Remove reference to deleted statsd config file (#25336) 2023-06-07 22:46:53 +02:00
renovate[bot]
c5e025a202 Update dependency webpack-bundle-analyzer to v4.9.0 (#25327) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-07 12:05:05 +02:00
renovate[bot]
5b2ff76a79 Update dependency dotenv to v16.1.3 (#25302) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-07 11:46:40 +02:00
renovate[bot]
b1f8013267 Update dependency sass-loader to v10.4.1 (#25315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-07 11:44:09 +02:00
Claire
83b03b528b Fix compatibility of recent migration with PostgreSQL 10 (#25324) 2023-06-07 01:53:50 +02:00
Eugen Rochko
66a5173629 Add legal as report category (#23941) 2023-06-06 23:41:59 +02:00
Eugen Rochko
7abfddd8a5 Change design of dropdowns in web UI (#25107) 2023-06-06 21:49:49 +02:00
Renaud Chaput
b452f64907 Configure RenovateBot to add proper language labels (#25316) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
 2023-06-06 18:53:43 +02:00
Matt Jankowski
23d64073d0 Fix RSpec/MissingExampleGroupArgument cop (#25310) 2023-06-06 15:51:42 +02:00
Matt Jankowski
dd76368f72 Fix RSpec/DescribedClass cop missed items (#25309) 2023-06-06 14:51:03 +02:00
Nick Schonning
ef344388c5 Autofix Rubocop Regex Style rules (#23690) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-06 14:50:51 +02:00
renovate[bot]
26db476771 Update dependency redis to v4.6.7 (#25300) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-06 14:16:41 +02:00
Matt Jankowski
8e745a234c Fix RSpec/DescribedClass cop (#25104) 2023-06-06 13:58:33 +02:00
Matt Jankowski
09b05d7e8b Misc spec coverage for Admin:: area controllers (#25282) 2023-06-06 13:57:00 +02:00
Daniel M Brasil
a66827421b Add test coverage for Mastodon::CLI::Accounts#reset_relationships (#25194) 2023-06-06 13:37:09 +02:00
Matt Jankowski
0aebcd4761 Add coverage for DomainBlock#public_domain method (#25283) 2023-06-06 13:34:04 +02:00
alfe
f9c819e8db Rewrite <LoadMore /> as FC and TS (#25259) 2023-06-06 11:28:50 +02:00
renovate[bot]
8390f2c863 Update dependency react-redux to v8.0.7 (#25298) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-06-06 11:18:56 +02:00
Claire
51046cb4db Fix autocomplete suggestions being cut off in compose form (#25275) 2023-06-06 11:05:25 +02:00
Eugen Rochko
2252e4d8bb Add webhook templating (#23289) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-06 10:42:47 +02:00
renovate[bot]
d3426d7365 Configure Renovate (#25255) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-06-06 10:42:23 +02:00
Eugen Rochko
8f34072fc0 Change follow button in account row to be more obvious in web UI (#24956) 2023-06-06 04:14:28 +02:00
Claire
ef10e189ed Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 68296cfb32
 2023-06-05 20:49:35 +02:00
Matt Jankowski
14dc8a6a5f Update Admin::Metrics::Measure classes for Rails 7 (#25236) 2023-06-05 20:46:04 +02:00
Claire
f2dbbcdec5 Fix CSP headers when S3_ALIAS_HOST includes a path component (#25273) 2023-06-05 17:35:05 +02:00
Claire
21f904b344 Add data-nosnippet so Google doesn't use trending posts in snippets for / (#25279) 2023-06-05 17:32:24 +02:00
Matt Jankowski
c74040abfa Rails 7 compatibility fix for Admin::Metrics::Dimension classes (#25277) 2023-06-05 16:52:33 +02:00
Daniel M Brasil
a274d79f58 Add test coverage for Mastodon::CLI::Accounts#cull (#25250) 2023-06-05 14:51:25 +02:00
S.H
94f9888d57 Fix not shown announcements in hometimeline. (#25251) 2023-06-05 14:49:51 +02:00
Nick Schonning
5846344977 Update kt-paperclip 7.2 from sha (#25274) 2023-06-05 14:40:35 +02:00
dependabot[bot]
d6feba366b [Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 
Port 9ba1135000 to glitch-soc

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:31:45 +02:00
Claire
cd107b054d [Glitch] Fix null signUp URL in various places 
Port 75ebb60ef6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:22 +02:00
y.takahashi
e7cb0dc83b [Glitch] Handle Surrogate Pairs in truncate() 
Port 5c744a5d7d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 13:28:02 +02:00
Claire
bda5be1406 Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
 2023-06-05 13:25:22 +02:00
Claire
4c2503d36c Fix design issues with recent react-intl upgrade (#25272) 2023-06-05 09:52:36 +02:00
Darius Kazemi
6debddcf89 Add exclusive lists (#22048) 
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 09:37:02 +02:00
Matt Jankowski
a04157e69f Add allow_other_host: true to backups controller (#25266) 2023-06-05 08:22:03 +02:00
Matt Jankowski
9c86b994db Add coverage for CLI::CanonicalEmailBlocks command (#25239) 2023-06-05 08:20:18 +02:00
Daniel M Brasil
427661c9eb Add test coverage for Mastodon::CLI::Accounts#merge (#25199) 2023-06-05 08:16:12 +02:00
Matt Jankowski
c671e23d28 Remove unmaintained nsa gem (#25265) 2023-06-05 01:57:05 +02:00
Eugen Rochko
c4426198c3 Change "Follow 7 people" to "Find at least 7 people to follow" in web UI (#24954) 2023-06-05 01:42:17 +02:00
Claire
85e0bd73cf Fix closeModal invocation (#2239) 
Fixes #2238

Some call sites where missed in 62f386d44e
 2023-06-04 22:05:45 +02:00