Jeremy Kescher
cb080ca3ef
Bump version to v4.3.0-alpha.4+glitch+cat+1.0.0
2024-05-30 18:51:42 +02:00
Claire
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
Emelia Smith
d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations ( #30316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 14:00:05 +00:00
Jeremy Kescher
6d448d46ff
Merge branch 'refs/heads/glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/actions/interactions.js
# app/javascript/flavours/glitch/reducers/statuses.js
2024-05-29 14:23:08 +02:00
Claire
51631c785f
Merge commit 'b6fd14f0e2842eca269ef8962e3c5bd560a76357' into glitch-soc/merge-upstream
...
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
Glitch-soc had changes to adjacent lines.
Ported upstream's changes.
2024-05-23 20:30:23 +02:00
Claire
133d98fb25
Normalize language code of incoming posts ( #30403 )
2024-05-23 17:28:18 +00:00
Jeremy Kescher
e73c612cb1
Merge branch 'refs/heads/glitch-soc' into develop
2024-05-11 23:31:31 +02:00
Claire
016d194274
Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, upstream added helpers right next to glitch-soc only
helpers.
Added upstream's helpers.
- `spec/models/status_spec.rb`:
Not a real conflict, upstream added specs right next to glitch-soc only
specs.
Added upstream's tests.
2024-05-06 17:53:51 +02:00
Matt Jankowski
dbaa4ed891
Use chewy which relaxes ES version reqs ( #30157 )
2024-05-06 11:50:45 +00:00
Claire
6f342a6d4c
Merge commit '34e826f373d20f6230d1ef0aa03ad41a3bdf5998' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict caused by our different theme systems.
Ported upstream's changes.
- `app/models/account.rb`:
Upstream basically made a change we already made.
Moved constant declaration to match upstream.
2024-05-01 18:56:48 +02:00
Claire
0fb469e2f3
Merge commit '52ab8a59c6e77b6409a7d4d81b15751732b3af91' into glitch-soc/merge-upstream
2024-05-01 17:30:52 +02:00
Matt Jankowski
da6b9238f5
Expand coverage for admin/metrics/measure/* classes ( #29914 )
2024-04-12 09:38:24 +00:00
Matt Jankowski
ec5a0e0f5e
Expand coverage for admin/metrics/dimension/* classes ( #29913 )
2024-04-12 09:18:35 +00:00
Matt Jankowski
59da591d13
Improve spec for dimension/languages admin metric ( #29842 )
2024-04-05 08:54:11 +00:00
Jeremy Kescher
a53f2cf970
Merge branch 'glitch-soc' into develop
2024-03-19 18:31:27 +01:00
Claire
b8f476256e
Merge commit 'd702a03a0c35fc631a0fa456532946e6751cbbfd' into glitch-soc/merge-upstream
2024-03-15 22:48:04 +01:00
Matt Jankowski
4f4132f1a1
Add diagnostic message for failure during CLI search deploy ( #29462 )
2024-03-15 14:26:23 +00:00
Jeremy Kescher
21a23b58ab
Merge branch 'glitch-soc' into develop
2024-03-14 21:46:57 +01:00
Jeremy Kescher
caccc2e0f4
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# README.md
# app/javascript/flavours/glitch/components/status.jsx
# app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx
# app/javascript/flavours/glitch/locales/en.json
# app/javascript/flavours/glitch/reducers/compose.js
# app/javascript/flavours/glitch/styles/components.scss
# app/javascript/mastodon/reducers/compose.js
# app/models/notification.rb
2024-03-14 20:01:30 +01:00
Claire
e91ede5be6
Merge commit 'df6086d4027910fb160d531b4fe7ffdec26b0cd7' into glitch-soc/merge-upstream
2024-03-14 17:27:16 +01:00
Matt Jankowski
681a89f684
Readability clean up in ImportVacuum spec ( #28955 )
2024-03-14 09:24:00 +00:00
Matt Jankowski
42875fee52
Add coverage for bad args/options in CLI::Domains#purge ( #29578 )
2024-03-14 08:58:53 +00:00
Claire
65ca37bbaa
Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
Conflict due to glitch-soc having factored the file differently.
Ported upstream's changes.
2024-03-13 20:14:18 +01:00
Claire
06881a8669
Merge commit '2c0441acd7f943a9873b650cf75d33c73d545acf' into glitch-soc/merge-upstream
2024-03-13 19:16:47 +01:00
Matt Jankowski
6262ceeb70
Fix RSpec/DescribedClass cop ( #29472 )
2024-03-13 15:42:39 +00:00
Matt Jankowski
8349b45d60
Accept extra args that we wont verify in ap/activity/add_spec ( #29005 )
2024-03-13 08:46:11 +00:00
Claire
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
Matt Jankowski
a7284690fc
Add coverage for admin/metrics base classes, simplify subclass generation ( #29527 )
2024-03-11 09:16:19 +00:00
Jeremy Kescher
009251a17d
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/mastodon/features/ui/components/navigation_panel.jsx
# app/javascript/mastodon/initial_state.js
# app/serializers/initial_state_serializer.rb
# config/initializers/chewy.rb
# config/locales/en.yml
# config/locales/ja.yml
2024-02-24 19:11:05 +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
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
Claire
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
Jeremy Kescher
ce878a78bb
Merge branch 'glitch-soc' into develop
2024-02-16 14:48:08 +01:00
Claire
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
Claire
9fee5e8526
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 11:56:12 +01:00
Matt Jankowski
ed4939296a
Reduce RSpec/MultipleExpectations in ap/activity/create spec ( #29224 )
2024-02-16 07:43:00 +00:00
Matt Jankowski
15437e4ad9
Add context and before to lengthy tag manager spec examples ( #29129 )
2024-02-08 10:03:04 +00:00
Claire
eff447a455
Rewrite signature verification using regexps and StringScanner ( #29133 )
2024-02-07 17:24:42 +00:00
Matt Jankowski
95da28d201
Add common ThreadingHelper module for specs ( #29116 )
2024-02-07 14:53:29 +00:00
Claire
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
Jeremy Kescher
c7e37c256e
Merge branch 'glitch-soc' into develop
2024-02-01 18:18:19 +01:00
Claire
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
Claire
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
Matt Jankowski
5fbdb2055b
Combine repeated subject in cli/accounts spec shared example ( #28942 )
2024-01-26 16:35:19 +00:00
Matt Jankowski
1a30a517d6
Combine repeated subjects in link details extractor spec ( #28941 )
2024-01-26 16:31:07 +00:00
Matt Jankowski
0e0a94f483
Handle CLI failure exit status at the top-level script ( #28322 )
2024-01-26 08:53:44 +00:00
Claire
087415d0fe
Add tests for processing statuses using bearcap URIs ( #28904 )
2024-01-25 11:13:36 +00:00
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
2024-01-18 22:59:27 +01:00
