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

39665 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire
85722a918d Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' 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
Eugen Rochko
4c9406bdb0
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
Emelia Smith
16dd3f08c1
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
Renaud Chaput
e34142782f
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
Matt Jankowski
75e299f440
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
Daniel M Brasil
4aff1d2974
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
jsgoldstein
18f092d927
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
Matt Jankowski
b85c387c5c
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]
db047e323b
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]
5265655549
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
renovate[bot]
7e22287caa
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
Claire
f378f10404
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
67d17ce194
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
Eugen Rochko
e4fd9503ec
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
Renaud Chaput
ed04c277b4
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
6c0e3f490a
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
Matt Jankowski
b74c3cd708
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
Nick Schonning
c66250abf1
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
renovate[bot]
9a653899e9
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
c42591356d
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
Matt Jankowski
1e243e2df7
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
Daniel M Brasil
eb6f8181e1
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
Matt Jankowski
b22bfae4f9
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
alfe
fb5bf5cbf8
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
renovate[bot]
50a8f5b8a7
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