e359a19387
Migrate to request specs in `/api/v1/admin/ip_blocks` ( #25331 )
1 year ago
9c7f3acaf6
Migrate to request specs in `/api/v1/admin/domain_allows` ( #25333 )
1 year ago
70cc460c39
Migrate to request specs in `/api/v1/admin/domain_blocks` ( #25335 )
1 year ago
1a723c3425
Migrate to request specs in `/api/v1/admin/reports` ( #25355 )
1 year ago
23c3e09853
Use `build` where possible in fabricators ( #25360 )
1 year ago
c4eba4b0d9
Disable paperclip processing in specs ( #25359 )
1 year ago
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
1 year ago
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
14fa204dfc
Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )
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
3e747f0863
Fix RSpec/PredicateMatcher cop ( #25102 )
1 year ago
15e143106e
Fix RSpec/ExpectInHook cop ( #25100 )
1 year ago
eada85f715
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
1 year ago
1361e4cb7a
Add request spec for backups download ( #25099 )
1 year ago
adaa7a61e9
Fix RSpec/RepeatedExample cop ( #24849 )
1 year ago
9e8323fdb9
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
0087959e0b
Add specs for admin/announcements CRUD actions ( #25077 )
1 year ago
ffce0d14bd
Improve test coverage for `/api/v1/featured_tags` ( #25076 )
1 year ago
c59cbf1a38
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
1 year ago
cc5d2e22dd
Improve test coverage for `/api/v1/admin/canonical_email_blocks` ( #24985 )
1 year ago
4d07793150
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
1 year ago
e0e7e73cb4
Implement pending specs for StatusesController ( #23969 )
1 year ago
67d0dfbc67
Improve test coverage for `/api/v1/admin/email_domain_blocks` ( #25017 )
1 year ago
8b4d7b22ed
Allow reports with long comments from remote instances, but truncate ( #25028 )
1 year ago
90466ee43a
Improve test coverage for `/api/v1/admin/ip_blocks_controller` ( #25031 )
1 year ago
c4f2b1e86a
Fix minor typos in comments and spec names ( #21831 )
1 year ago
9011b008c2
Add tests for avatar/header in backup service ( #25037 )
1 year ago
9082e53002
Add spec for migration warning module ( #25033 )
1 year ago
86961b5b7b
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
1 year ago
99f1302cc3
Fix reports not being closed when performing batch suspensions ( #24988 )
1 year ago
74c77c5274
Remove usage of random sample values in specs ( #24869 )
1 year ago
540b446f77
Replace i18n view spec with helper spec ( #24966 )
1 year ago
42ca35dcbc
I18n pluralization errors ( #24963 )
1 year ago
7cf0ce19e2
Fix uncaught NoMethodError error in `/api/v1/admin/canonical_email_blocks/test` ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
c8998a2678
Change profile updates to be sent to recently-mentioned servers ( #24852 )
1 year ago
2500233709
Fix RSpec/RepeatedExampleGroupDescription cop ( #24850 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
bf1a16e278
Fix RSpec/SharedContext cop ( #24847 )
1 year ago
1598cf9043
Fix RSpec/ScatteredSetup cop ( #24848 )
1 year ago
9c5c803c7c
Add test coverage for `Mastodon::IpBlocksCLI` ( #24935 )
1 year ago
c752e939d5
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
1 year ago
da25a0bd04
Fix rubocop issues in glitch-soc-specific code
1 year ago
348aed03cf
Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Upstream made changes, but we had removed it.
Discarded upstream changes.
- `.rubocop_todo.yml`:
Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
Minor upstream code style change where glitch-soc had slightly different code
due to handling of local-only posts.
Updated to match upstream's code style.
- `app/models/status.rb`:
Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
Upstream rewrote a lot of the backup service, glitch-soc had changes because
of exporting local-only posts.
Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
Upstream split the file into different files, while glitch-soc had a few
extra routes.
Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
and `config/routes/admin.rb`
- `db/schema.rb`:
Upstream has new migrations, while glitch-soc had an extra migration.
Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
Upstream added support to set version tags from environment variables, while
glitch-soc has an extra `+glitch` tag.
Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests due to
`directMessage` handling.
Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
Minor code style change upstream, while glitch-soc has extra tests.
Applied upstream's changes while keeping glitch-soc's extra tests.
1 year ago
2aaf3528ca
Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
Code style changes but we have a different version.
Kept our version.
- `streaming/index.js`:
Upstream fixed a typo close to glitch-soc-only code.
Applied upstream's changes.
1 year ago
a82a6882ad
Add test coverage for `Mastodon::SettingsCLI` ( #24856 )
1 year ago
53e3a1b06d
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
1 year ago
2f2c8f671b
Autofix Rubocop Style/HashSyntax ( #23754 )
1 year ago
dfbb3a61c9
Enable Rubocop Rails/FilePath ( #23854 )
1 year ago
cf86cc68b7
Fix RSpec/InferredSpecType cop ( #24736 )
1 year ago
8dec215a57
Fix RSpec/ContextWording cop ( #24739 )
1 year ago
2cd141b65f
Fix RSpec/MultipleSubjects cop ( #24738 )
1 year ago
790aa68ea3
Misc spec cleanup ( #24822 )
1 year ago
fded3a99ab
Spec coverage for settings/preferences/* controllers ( #24825 )
1 year ago
Daniel M Brasil
Matt Jankowski
Claire
Eugen Rochko
Darius Kazemi
Renaud Chaput
Christian Schmidt
Emelia Smith
Nick Schonning