c94bb9ba9a
Disable paperclip processing in specs ( #25359 )
1 year ago
8c26d49cbd
Merge commit '16dd3f08c1e5396d5f9ff3f13417901bc4e4b8b9' 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
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' 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
d8b0a732aa
Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' 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
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' 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
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
1 year ago
b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
1 year ago
93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' 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
4aff1d2974
Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )
1 year ago
6c0e3f490a
Fix RSpec/MissingExampleGroupArgument cop ( #25310 )
1 year ago
b74c3cd708
Fix `RSpec/DescribedClass` cop missed items ( #25309 )
1 year ago
c42591356d
Fix `RSpec/DescribedClass` cop ( #25104 )
1 year ago
1e243e2df7
Misc spec coverage for `Admin::` area controllers ( #25282 )
1 year ago
eb6f8181e1
Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` ( #25194 )
1 year ago
b22bfae4f9
Add coverage for `DomainBlock#public_domain` method ( #25283 )
1 year ago
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
af135bddd0
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
1 year ago
3b21c13dcc
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
1 year ago
70cd2d6000
Add test coverage for `Mastodon::CLI::Accounts#cull` ( #25250 )
1 year ago
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
bacb674921
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
5c87c66504
Add coverage for CLI::CanonicalEmailBlocks command ( #25239 )
1 year ago
03a707f6a6
Add test coverage for `Mastodon::CLI::Accounts#merge` ( #25199 )
1 year ago
b0780cfeed
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
1 year ago
8884d1ece0
Add support for importing lists ( #25203 )
1 year ago
2a353200ad
Add test coverage for `Mastodon::CLI::Accounts#rotate` ( #25212 )
1 year ago
942d850b0a
Allow carets in URL search params ( #25216 )
1 year ago
f906e21a4f
Add test coverage for `Mastodon::CLI::Accounts#refresh` ( #25196 )
1 year ago
f84037ae2b
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
1 year ago
e9385e93e9
Add a confirmation screen when suspending a domain ( #25144 )
1 year ago
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
b0104e4c33
Silence output to stdout during cli specs ( #25211 )
1 year ago
3c41547f49
Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )
1 year ago
8b1bfaed3e
Add specs for admin/webhooks CRUD actions ( #25133 )
1 year ago
665bb237a8
Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )
1 year ago
bf9a7ce8e8
Add test coverage for `Mastodon::CLI::Accounts#unfollow` ( #25162 )
1 year ago
dbc44be0ca
Add test coverage for `Mastodon::CLI::Accounts#follow` ( #25161 )
1 year ago
3d253b9830
Add test coverage for `Mastodon::CLI::Accounts#approve` ( #25160 )
1 year ago
bbbcdc083f
Add test coverage for `Mastodon::CLI::Accounts#delete` ( #25146 )
1 year ago
bdc7548652
Add test coverage for `Mastodon::CLI::Accounts#modify` ( #25145 )
1 year ago
11b8336418
Add test coverage for `Mastodon::CLI::Accounts#create` ( #25143 )
1 year ago
0669783da8
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
0e7466717f
Merge commit '391c089d0db58d731765dba730a5e1f2fe8570a6' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
We removed it from glitch-soc.
Keep it deleted.
1 year ago
6dbd44faea
Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream
1 year ago
0f2c16ac4b
Fix RSpec/NoExpectationExample cop ( #25103 )
2 years ago
61f6cd45e3
Fix glitch-soc-only tests being broken because of test refactor
2 years ago
e2ab9d4dad
Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream
2 years ago
2e02d03524
Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream
2 years ago
f959f6cdbb
Merge commit 'e60414792d86a99c0f401f3c1bab92ee37835d39' into glitch-soc/merge-upstream
2 years ago
b735954971
Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' 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.
2 years ago
384345b0de
Add CLI Base class for command line code ( #25106 )
2 years ago
d2e5430d4a
Fix RSpec/ExpectChange cop ( #25101 )
2 years ago
b896b16cb3
Fix RSpec/PredicateMatcher cop ( #25102 )
2 years ago
778e4a7bf7
Fix RSpec/ExpectInHook cop ( #25100 )
2 years ago
b6b4ea4ca5
Move the mastodon/*_cli files to mastodon/cli/* ( #24139 )
2 years ago
c9f980b268
Add request spec for backups download ( #25099 )
2 years ago
e387175fc9
Fix RSpec/RepeatedExample cop ( #24849 )
2 years ago
9f5deb310b
Fix Performance/MapCompact cop ( #24797 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
2877c80dbc
Add specs for admin/announcements CRUD actions ( #25077 )
2 years ago
b473df9a14
Improve test coverage for `/api/v1/featured_tags` ( #25076 )
2 years ago
2a61f14753
Fix account confirmation flow not returning to app after captcha validation ( #25057 )
2 years ago
4a22e72b9b
Improve test coverage for `/api/v1/admin/canonical_email_blocks` ( #24985 )
2 years ago
ce8b5899ae
Fix POST `/api/v1/admin/domain_allows` returning 200 when no domain is specified ( #24958 )
2 years ago
e328ab7e5a
Implement pending specs for StatusesController ( #23969 )
2 years ago
f3feb4c891
Improve test coverage for `/api/v1/admin/email_domain_blocks` ( #25017 )
2 years ago
19f9098551
Allow reports with long comments from remote instances, but truncate ( #25028 )
2 years ago
d51464283c
Improve test coverage for `/api/v1/admin/ip_blocks_controller` ( #25031 )
2 years ago
99e2e9b81f
Fix minor typos in comments and spec names ( #21831 )
2 years ago
b805b7f021
Add tests for avatar/header in backup service ( #25037 )
2 years ago
d34d94d08f
Add spec for migration warning module ( #25033 )
2 years ago
e60414792d
Add polling and automatic redirection to `/start` on email confirmation ( #25013 )
2 years ago
3ed3d54bf3
Fix reports not being closed when performing batch suspensions ( #24988 )
2 years ago
604e1c2b11
Remove usage of random sample values in specs ( #24869 )
2 years ago
b84bc2de5d
Replace i18n view spec with helper spec ( #24966 )
2 years ago
679aca46da
I18n pluralization errors ( #24963 )
2 years ago
433ab0c9a3
Fix uncaught NoMethodError error in `/api/v1/admin/canonical_email_blocks/test` ( #24947 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
9015c2d646
Change profile updates to be sent to recently-mentioned servers ( #24852 )
2 years ago
2c2d924942
Fix RSpec/RepeatedExampleGroupDescription cop ( #24850 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2 years ago
bf3ebeb42f
Fix RSpec/SharedContext cop ( #24847 )
2 years ago
a610a02d4f
Fix RSpec/ScatteredSetup cop ( #24848 )
2 years ago
9cbda99941
Add test coverage for `Mastodon::IpBlocksCLI` ( #24935 )
2 years ago
6b0942d107
Change AccessTokensVacuum to also delete expired tokens ( #24868 )
2 years ago
8b31030fe4
Fix rubocop issues in glitch-soc-specific code
2 years ago
d77fbbed73
Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' 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.
2 years ago
2d029dedd9
Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' 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.
2 years ago
c9210af3ee
Add test coverage for `Mastodon::SettingsCLI` ( #24856 )
2 years ago
c3c7d59072
Fix infinite loop in AccountsStatusesCleanupScheduler ( #24840 )
2 years ago
da3bd913ae
Autofix Rubocop Style/HashSyntax ( #23754 )
2 years ago
1fe04f740a
Enable Rubocop Rails/FilePath ( #23854 )
2 years ago
c97b611b6b
Fix RSpec/InferredSpecType cop ( #24736 )
2 years ago
710745e16b
Fix RSpec/ContextWording cop ( #24739 )
2 years ago
cf18cc2891
Fix RSpec/MultipleSubjects cop ( #24738 )
2 years ago
bdcd8a9e88
Misc spec cleanup ( #24822 )
2 years ago
08fb9d300a
Spec coverage for settings/preferences/* controllers ( #24825 )
2 years ago
a2a22bad23
Fix various edge cases with local moves ( #24812 )
2 years ago
1e75eb690d
Fix own posts not getting delivered to own lists ( #24810 )
2 years ago
c98b012583
Change Move handler to also move list memberships ( #24808 )
2 years ago
3df665fd23
Fix Lint/ConstantDefinitionInBlock cop ( #24763 )
2 years ago
8b636a29c6
Improve automatic post cleanup worker performances ( #24785 )
2 years ago
Matt Jankowski
Claire
Daniel M Brasil
Eugen Rochko
Darius Kazemi
Renaud Chaput
Christian Schmidt
Emelia Smith
Nick Schonning