ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
1 year ago
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
1 year ago
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
1 year ago
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
1 year ago
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
1 year ago
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
1 year ago
23d64073d0
Fix RSpec/MissingExampleGroupArgument cop ( #25310 )
1 year ago
dd76368f72
Fix `RSpec/DescribedClass` cop missed items ( #25309 )
1 year ago
8e745a234c
Fix `RSpec/DescribedClass` cop ( #25104 )
1 year ago
09b05d7e8b
Misc spec coverage for `Admin::` area controllers ( #25282 )
1 year ago
a66827421b
Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` ( #25194 )
1 year ago
0aebcd4761
Add coverage for `DomainBlock#public_domain` method ( #25283 )
1 year ago
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
14dc8a6a5f
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
1 year ago
c74040abfa
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
1 year ago
a274d79f58
Add test coverage for `Mastodon::CLI::Accounts#cull` ( #25250 )
1 year ago
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
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>
1 year ago
9c86b994db
Add coverage for CLI::CanonicalEmailBlocks command ( #25239 )
1 year ago
427661c9eb
Add test coverage for `Mastodon::CLI::Accounts#merge` ( #25199 )
1 year ago
29851c83bd
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
572086c8ad
Add support for importing lists ( #25203 )
1 year ago
269812919e
Add test coverage for `Mastodon::CLI::Accounts#rotate` ( #25212 )
1 year ago
f681f81cbf
Allow carets in URL search params ( #25216 )
1 year ago
6f0217d056
Add test coverage for `Mastodon::CLI::Accounts#refresh` ( #25196 )
1 year ago
a6f0456756
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
52b4e33d7f
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
971eafc709
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
3b2e804a83
Silence output to stdout during cli specs ( #25211 )
1 year ago
fc30a59e10
Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )
1 year ago
216298a400
Add specs for admin/webhooks CRUD actions ( #25133 )
1 year ago
93f7408c10
Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )
1 year ago
ac9089805f
Add test coverage for `Mastodon::CLI::Accounts#unfollow` ( #25162 )
1 year ago
66b7c04b62
Add test coverage for `Mastodon::CLI::Accounts#follow` ( #25161 )
1 year ago
0c652b4b6d
Add test coverage for `Mastodon::CLI::Accounts#approve` ( #25160 )
1 year ago
ba924d4642
Add test coverage for `Mastodon::CLI::Accounts#delete` ( #25146 )
1 year ago
ad3f504a21
Add test coverage for `Mastodon::CLI::Accounts#modify` ( #25145 )
1 year ago
dd0d755824
Add test coverage for `Mastodon::CLI::Accounts#create` ( #25143 )
1 year ago
53b8a15ee9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
973743ff50
Merge commit 'b6c687abc288b3ea7fe16bf38912462c2ca1b4e4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
006bc485e4
Merge commit '3e747f08639a78ac86858f6a2d2fc08a05ff3365' into glitch-soc/merge-upstream
1 year ago
1411f75aae
Fix RSpec/NoExpectationExample cop ( #25103 )
1 year ago
ab642ee227
Fix glitch-soc-only tests being broken because of test refactor
1 year ago
569302e5ce
Merge commit 'adaa7a61e9c87859251f4ac9be387d3d24c0a962' into glitch-soc/merge-upstream
1 year ago
ee6f9d2c92
Merge commit 'cc5d2e22dd4b7afb9035cf999979e3cd36d97e46' into glitch-soc/merge-upstream
1 year ago
560f605dc2
Merge commit '86961b5b7b459fd778a9b697bbdfbda03512babb' into glitch-soc/merge-upstream
1 year ago
11368da545
Merge commit 'afb74b97b237a32c5e1db2a6a9968d587a3d5dd3' into glitch-soc/merge-upstream
...
Conflicts:
- `config/webpack/generateLocalePacks.js`:
A dependency update changed how functions are imported.
Also, some linting fixes not applicable to glitch-soc.
1 year ago
f97a429d20
Add CLI Base class for command line code ( #25106 )
1 year ago
bc1dae0bc4
Fix RSpec/ExpectChange cop ( #25101 )
1 year ago
Claire
Matt Jankowski
Daniel M Brasil
Eugen Rochko
Darius Kazemi
Renaud Chaput
Christian Schmidt