Kouhai
bcc0a24acd
Merge remote-tracking branch 'glitch/main' ( 660372d130
)
12 months ago
Kouhai
78a9906dfe
Merge remote-tracking branch 'glitch/main' ( a21fe8687e
)
12 months ago
Claire
660372d130
Revert recent CSP changes ( #2485 )
...
* Revert "Fix image and media loading when using external storage server"
This reverts commit 6cfa0245ca
.
* Revert "Change glitch-soc's CSP config to match upstream's closer (#2474 )"
This reverts commit d59196e170
.
12 months ago
Matt Jankowski
19baf22683
Add missing email previews for `AdminMailer` ( #28044 )
12 months ago
Kevin Bongart
7877fcd83c
Deduplicate IDs in relationships and familiar_followers APIs ( #27982 )
12 months ago
Matt Jankowski
973597c6f1
Consolidate configuration of `Sidekiq::Testing.fake!` setup ( #28046 )
12 months ago
Matt Jankowski
9742bccbe7
Add coverage for `api/v2/media` endpoint ( #28027 )
12 months ago
Eugen Rochko
cdc57c74b7
Fix unsupported time zone or locale preventing sign-up ( #28035 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Matt Jankowski
67fd3187b3
Update rspec fixture path config to silence deprecation warning ( #28018 )
12 months ago
Matt Jankowski
30ee4aaff4
Convert measurement `api/v1/admin/*` controller specs to request specs ( #28005 )
12 months ago
Matt Jankowski
32e19e3af6
Reduce `.times` usage in request and controller specs ( #27949 )
12 months ago
Matt Jankowski
f7cb64a184
Add coverage for `settings/privacy` controller ( #28000 )
12 months ago
Claire
6cfa0245ca
Fix image and media loading when using external storage server
...
Fixes #2479
12 months ago
Matt Jankowski
b2e8af8889
Add coverage for `settings/verifications` controller ( #28001 )
12 months ago
Matt Jankowski
6d51ac246b
Update partials for the `AdminMailer.new_trends` mailer ( #28011 )
12 months ago
Matt Jankowski
a6d446e6a7
Add coverage for `remote_interaction_helper` ( #28002 )
12 months ago
Claire
d59196e170
Change glitch-soc's CSP config to match upstream's closer ( #2474 )
12 months ago
Matt Jankowski
876f5b1d12
Convert `/instances/*` controller specs to request specs ( #27988 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Matt Jankowski
718c95e7af
Convert `api/v1/custom_emojis` controller spec to request spec ( #27985 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
12 months ago
Claire
c260a68f54
Clean up some `Mastodon::CLI::Accounts` tests ( #27473 )
12 months ago
Matt Jankowski
17582d36d5
Convert `api/v1/preferences` controller spec to request spec ( #27987 )
12 months ago
Matt Jankowski
9a01a260a0
Convert `api/v1/scheduled_statuses` controller spec to request spec ( #27986 )
12 months ago
Matt Jankowski
b9fb47aeb1
Convert `api/v1/endorsements` controller spec to request spec ( #27984 )
12 months ago
Matt Jankowski
371f355719
Reduce `.times` usage in `AccountStatusesCleanupPolicy` ( #27947 )
12 months ago
Matt Jankowski
d2aacea8da
Reduce `.times` usage in AccountSearch spec, use constant for default limit ( #27946 )
12 months ago
Matt Jankowski
00c6ebd86f
Reduce `.times` usage in `StatusPin` and add `PIN_LIMIT` constant in validator ( #27945 )
12 months ago
Matt Jankowski
1fabf20a88
Reduce `.times` usage in `lib/mastodon/cli/accounts` spec ( #27944 )
12 months ago
Matt Jankowski
09a2db3f6c
Move api/v2/filters spec to correct path location ( #27950 )
12 months ago
Matt Jankowski
e892efbc40
Configure elastic search integration with rspec tag ( #27882 )
12 months ago
Claire
297839c10c
Rewrite `/api/v1/statuses` tests as request specs ( #27891 )
12 months ago
Claire
9257737675
Rewrite `/api/v1/accounts` tests as request specs ( #27888 )
12 months ago
Matt Jankowski
549e8e7baf
Add `email_spec` and speedup/cleanup to `spec/mailers` ( #27902 )
12 months ago
Matt Jankowski
1526e54ac6
Add spec coverage for `workers/redownload_*` worker classes ( #27892 )
12 months ago
Matt Jankowski
cb1a4a8713
Reduce expectations for `RSpec/MultipleExpectations` cop in `spec/presenters` specs ( #27881 )
12 months ago
Matt Jankowski
155fb84141
Improve spec coverage for collection of `workers/` classes ( #27874 )
12 months ago
Matt Jankowski
8a285413f7
Reduce expectations for `RSpec/MultipleExpectations` cop in `MoveWorker` spec ( #27880 )
12 months ago
Matt Jankowski
3f0c1566c3
Reduce expectations for `RSpec/MultipleExpectations` cop in `api/v1/accounts/relationships` spec ( #27879 )
12 months ago
Matt Jankowski
c1f93def40
Reduce expectations for `RSpec/MultipleExpectations` cop in `controllers/statuses` spec ( #27875 )
12 months ago
Matt Jankowski
04121bd020
Disable simplecov `enable_coverage_for_eval` option, move to standalone file ( #27869 )
1 year ago
Matt Jankowski
3de9145613
Move controller specs for `well-known` endpoints to request specs ( #27855 )
1 year ago
Matt Jankowski
12a5b7391d
Add spec for well known change password endpoint ( #27856 )
1 year ago
Matt Jankowski
fe58ac8d9f
Improve spec coverage for `api/web/push_subscriptions` controller ( #27858 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Matt Jankowski
7c72944661
Use `Lcov` simplecov formatter on CI and `HTML` elsewhere ( #27859 )
1 year ago
Nick Schonning
36d7d1781f
Add CodeCov for Ruby coverage reports ( #23868 )
1 year ago
Matt Jankowski
b2c5b20ef2
Fix `RSpec/AnyInstance` cop ( #27810 )
1 year ago
Matt Jankowski
d562fb8459
Specs for minimal CSP policy in `Api::` controllers ( #27845 )
1 year ago
Matt Jankowski
5e2ecc736d
Remove double `subject` in api/v1/accounts/relationships spec ( #27839 )
1 year ago
Matt Jankowski
b7807f3d84
Use `normalizes` to prepare `Webhook#events` value ( #27605 )
1 year ago
Matt Jankowski
49ba5a9f94
Use `hash_including` to check `AccountFilter` setup in `admin/accounts` controller spec ( #27838 )
1 year ago
Matt Jankowski
a36b59be8a
Spec coverage for `api/v1/trends` controllers ( #27837 )
1 year ago
Claire
07a4059901
Add support for invite codes in the registration API ( #27805 )
1 year ago
Eugen Rochko
0d14fcebae
Change link previews to keep original URL from the status ( #27312 )
1 year ago
Matt Jankowski
9dc3ce878b
Speed-up in `Settings::` controllers specs ( #27808 )
1 year ago
Matt Jankowski
e79bf1b1e7
Minor speed improvement on `controllers/accounts` spec ( #27679 )
1 year ago
Claire
c451bbe249
Allow viewing and severing relationships with suspended accounts ( #27667 )
1 year ago
Matt Jankowski
548bb30b2a
Consolidate html page title output logic into helper ( #27563 )
1 year ago
Matt Jankowski
63c9102f8a
Fix `RSpec/MessageChain` cop ( #27776 )
1 year ago
Matt Jankowski
c9204b792c
Fix `Rails/I18nLocaleTexts` cop ( #27779 )
1 year ago
Matt Jankowski
69d00e2721
Fix `RSpec/InstanceVariable` cop ( #27766 )
1 year ago
Matt Jankowski
4329616c53
Ignore block result of `send` method and remove `rubocop:disable` in deepl spec ( #27741 )
1 year ago
Matt Jankowski
b05575e242
Move RSpec config for streaming/search managers to be near classes ( #27761 )
1 year ago
Matt Jankowski
ce91d14d48
Fix `Style/WordArray` cop ( #27770 )
1 year ago
Matt Jankowski
c03bd2a238
Don't stub SUT in `FollowLimitValidator` spec ( #27760 )
1 year ago
Matt Jankowski
9b7b4d748f
Simplify request cache spec shared examples ( #27673 )
1 year ago
Claire
23e32a4b30
Fix format-dependent redirects being cached regardless of requested format ( #27632 )
1 year ago
Matt Jankowski
e545978076
Use framework helpers instead of i-vars in controller specs ( #27767 )
1 year ago
Matt Jankowski
ee57bb4b44
Account statuses filter spec speedup ( #27674 )
1 year ago
Matt Jankowski
ae7c20b00c
Move search and streaming spec manager classes to separate support files ( #27727 )
1 year ago
Matt Jankowski
370802ce48
Add coverage for `CLI::Maintenance#fix_duplicates` command ( #25252 )
1 year ago
Matt Jankowski
1d51e10510
Consolidate JSON parsing in serializers specs ( #27693 )
1 year ago
Matt Jankowski
a688a9ed20
Use strings instead of numeric literals and remove `rubocop:disable` in cache spec ( #27742 )
1 year ago
Matt Jankowski
dc0bf87090
Remove unused before block from settings/branding spec ( #27759 )
1 year ago
Matt Jankowski
45770c9306
Fix `Performance/MapMethodChain` cop ( #27744 )
1 year ago
Matt Jankowski
49e2772064
Fix `RSpec/MessageSpies` cop ( #27751 )
1 year ago
Matt Jankowski
2862ad701f
Stub controller methods and remove `rubocop:disable` in captcha feature spec ( #27743 )
1 year ago
Matt Jankowski
cfa14ec6d1
Fix `Lint/EmptyBlock` cop ( #27748 )
1 year ago
Matt Jankowski
b06284c572
Fix `RSpec/HookArgument` cop ( #27747 )
1 year ago
Matt Jankowski
d6f50839e1
Fix `RSpec/SpecFilePathFormat` cops ( #27730 )
1 year ago
Matt Jankowski
fe26f33e0a
Fix `Rails/RedundantActiveRecordAllMethod` cop ( #26885 )
1 year ago
Matt Jankowski
949f5eb860
Fix `RSpec/MetadataStyle` cop in spec/ ( #27729 )
1 year ago
Claire
c0989b78f8
Fix incoming status creation date not being restricted to standard ISO8601 ( #27655 )
1 year ago
Renaud Chaput
6712bf86cd
Fixes website not loading for unlogged users ( #27698 )
1 year ago
Claire
0337df3a42
Fix posts from threads received out-of-order sometimes not being inserted into timelines ( #27653 )
1 year ago
Claire
d649bbf28f
Add some more tests and clean up domain block controller ( #27469 )
1 year ago
Matt Jankowski
beee9ea991
Fix `RSpec/LetSetup` cop in spec/controllers/admin area ( #27619 )
1 year ago
Matt Jankowski
eae5c7334a
Extract class from CSP configuration/initialization ( #26905 )
1 year ago
Matt Jankowski
2e6bf60f15
Use `deliveries.size` in mailer-related examples in controller specs ( #27589 )
1 year ago
Claire
93e4cdc31b
Fix hashtag matching pattern matching some URLs ( #27584 )
1 year ago
Matt Jankowski
1f5187e2e2
Misc spec/refactor to user mailer and user mailer spec ( #27486 )
1 year ago
Claire
bbf46cc418
Fix error and incorrect URLs in `/api/v1/accounts/:id/featured_tags` for remote accounts ( #27459 )
1 year ago
Jeong Arm
8f998cd96a
Handle featured collections without items ( #27581 )
1 year ago
Claire
49b8433c56
Fix confusing screen when visiting a confirmation link for an already-confirmed email ( #27368 )
1 year ago
Claire
4b0fb764c3
Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
...
Conflicts and ported changes:
- updated `@rails/ujs` imports
1 year ago
Claire
e25cc4deb7
Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream
...
Conflicts:
- `config/navigation.rb`:
Conflict due to glitch-soc having extra navigation items for its theming
system.
Ported upstream changes.
1 year ago
Claire
787d5ad386
Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Caused by a glitch-soc-only dependency (`exif-js`).
Kept it.
1 year ago
Claire
b0c76eaadd
Merge commit '0ad66175bf59a34b03d9ab2347181548d07089ea' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream changed one import, close to a glitch-soc-only import to handle
different max character counts.
Ported upstream's change.
1 year ago
Matt Jankowski
e93a75f1a1
Rails 7.1 update ( #25963 )
1 year ago
Daniel M Brasil
26d2a2a0cc
Migrate to request specs in `/api/v1/media` ( #25543 )
1 year ago
Claire
bcae744275
Fix some link anchors being recognized as hashtags ( #27271 )
1 year ago
Matt Jankowski
b0213472df
Validate allowed schemes on preview card URLs ( #27485 )
1 year ago
kouhai
b24d7bb6f2
th: Merge remote-tracking branch 'glitch/main' ( 18eacc7a07
)
1 year ago
Matt Jankowski
ab0fb81479
Configure brakeman to ignore url safe preview card urls ( #25883 )
1 year ago
Claire
13688539bc
Fix processing LDSigned activities from actors with unknown public keys ( #27474 )
1 year ago
Claire
74fd46d3ab
Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream
1 year ago
Matt Jankowski
9f218c9924
Refactor appeal partial to avoid brakeman XSS warning ( #25880 )
1 year ago
Matt Jankowski
bcd0171e5e
Fix `Lint/UselessAssignment` cop ( #27472 )
1 year ago
Daniel M Brasil
7bc8f03162
Add test coverage for `Mastodon::CLI::Accounts#migrate` ( #25284 )
1 year ago
Matt Jankowski
a1b27d8b61
Fix `Naming/VariableNumber` cop ( #27447 )
1 year ago
Emelia Smith
7c3fea7275
Feature: Allow token introspection without read scope ( #27142 )
1 year ago
Daniel M Brasil
091a21e1bc
Add test coverage for `Mastodon::CLI::Accounts#prune` ( #25204 )
1 year ago
Claire
e9dc30cdba
Fix duplicate github annotations for rspec failures ( #27450 )
1 year ago
Claire
63179f0bf4
Merge commit '5ef26d8fd50081c642b858a82bf0c5431b1c7e83' into glitch-soc/merge-upstream
1 year ago
Claire
c10a667ac2
Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream
1 year ago
Claire
b867d4581e
Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
Glitch-soc had a few extra lines in this file to account for a different
default setting. This file got replaced by
`spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
additions were moved too.
Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
Add glitch-soc-only attribute `content_type`.
1 year ago
Claire
656a41db2a
Merge commit '77098c6f1c25958960df98a1510b28352a39704f' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated its README, we have a completely different one.
Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
Upstream refactored stuff and the conflict is because of glitch-soc's theming
system.
Ported upstream changes while accounting for the different theming system.
1 year ago
Nick Schonning
5ef26d8fd5
Add RSpec GitHub annotations gem ( #24040 )
1 year ago
Matt Jankowski
71447ab19f
Fix `Capybara/ClickLinkOrButtonStyle` cop in spec/features/admin area ( #27445 )
1 year ago
Matt Jankowski
2528a0721f
Update `rubocop-capybara` to version 2.19.0 ( #26982 )
1 year ago
Claire
b34a2b1b33
Fix errors in CLI specs ( #27399 )
1 year ago
Victor Lee
c4bddc9855
Add spec for poll model ( #23399 )
...
Co-authored-by: Nick Schonning <nschonni@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Matt Jankowski
12bb7be8b5
Spec speed ups on `AccountsController` spec ( #25391 )
1 year ago
Matt Jankowski
d54fec24e5
Add coverage for `CLI::PreviewCards#remove` command ( #27441 )
1 year ago
Matt Jankowski
19900f647e
Add coverage for `UnreservedUsernameValidator` ( #25590 )
1 year ago
Matt Jankowski
fc9ab61448
Expand spec coverage of `CLI::Media` ( #27437 )
1 year ago
Matt Jankowski
893b2f33fd
Extract shared example for cacheable response in specs ( #25388 )
1 year ago
Matt Jankowski
708299bb0d
Misc coverage improvements for `Admin::` and `Settings::` controllers ( #25346 )
1 year ago
Daniel M Brasil
e0ed0f8c7c
Migrate to request specs in `/api/v1/notifications` ( #25553 )
1 year ago
Daniel M Brasil
cafdaec6cf
Migrate to request specs in `/api/v1/lists/:id/accounts` ( #25468 )
1 year ago
Daniel M Brasil
8e6116503d
Migrate to request specs in `/api/v1/blocks` ( #25517 )
1 year ago
Daniel M Brasil
d9caa6ed24
Migrate to request specs in `/api/v1/admin/accounts` ( #25563 )
1 year ago
Matt Jankowski
f5bc1f20e2
Add coverage for `ExistingUsernameValidator` ( #25592 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Matt Jankowski
f8afa0f614
Remove unused stub json ld context ( #25454 )
1 year ago
Matt Jankowski
00e92b4038
Add coverage for `CLI::Statuses` command ( #25321 )
1 year ago
Claire
299aa71c8f
Fix handling of `inLanguage` attribute in preview card processing ( #27423 )
1 year ago
Daniel M Brasil
82beeb2f7e
Migrate to request specs in `/api/v1/admin/trends/links` ( #25739 )
1 year ago
Matt Jankowski
1b195ce115
Speed-up on `Rack::Attack` spec ( #25542 )
1 year ago
Claire
71cfdd7865
Fix duplicate tests ( #27395 )
1 year ago
Matt Jankowski
cad8cc90ba
Speed-up on `MoveWorker` spec ( #25528 )
1 year ago
Daniel M Brasil
058f73a4f5
Add request specs for `/api/v1/reports` ( #25475 )
1 year ago
Matt Jankowski
abf0e1fa39
Move `SignedReqestHelpers` rspec config to separate file ( #25453 )
1 year ago
Daniel M Brasil
bc6cd27d9e
Migrate to request specs in `/api/v1/followed_tags` ( #25472 )
1 year ago
Matt Jankowski
fd9dea21d0
DB speedup in `API::` controller/request specs ( #25516 )
1 year ago
Daniel M Brasil
ecdb31d479
Migrate to request specs in `/api/v1/favourites` ( #25518 )
1 year ago
Daniel M Brasil
7664e3b692
Migrate to request specs in `/api/v1/statuses/:status_id/source` ( #25634 )
1 year ago
Daniel M Brasil
4230d1ee0a
Migrate to request specs in `/api/v1/timelines/tag/:hashtag` ( #25797 )
1 year ago
KMY(雪あすか)
45bdd60f3c
Fix when unfollow a tag, my post also disappears from the home timeline ( #27391 )
1 year ago
Matt Jankowski
133f218a4d
Add system specs for admin area `batch` actions ( #25027 )
1 year ago
Claire
3735e6f79d
Merge commit '27e84c069112a3d2abfad947642457cc997a261a' into glitch-soc/merge-upstream
1 year ago
Claire
27e84c0691
Fix duplicate reports being sent when reporting some remote posts ( #27355 )
1 year ago
Claire
53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
1 year ago
Claire
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
1 year ago
Claire
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
1 year ago
Claire
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
1 year ago
Claire
3262d1f1b6
Fix incorrect serialization of regional languages in `contentMap` ( #27207 )
1 year ago
Claire
340c390849
Fix crash when filtering for “dormant” relationships ( #27306 )
1 year ago
Claire
40ba6e119b
Fix Vary headers not being set on some redirects ( #27272 )
1 year ago
Matt Jankowski
72cec47c13
Silence deprecation warning in CacheBuster spec ( #27264 )
1 year ago
gunchleoc
68ec1d180a
Fix language sorting in settings ( #27158 )
1 year ago
Matt Jankowski
c676bc91e9
Dont match mention in url query string ( #25656 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Claire
ceb365c419
Fix boosts of local users being filtered in account timelines ( #27204 )
1 year ago
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
1 year ago
Claire
828eebad48
Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API ( #26998 )
1 year ago
Kouhai
150feaf9b7
th: Merge remote-tracking branch 'glitch/main'
1 year ago
Claire
f546b0c999
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
Claire
65646a3e89
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
Claire
94893cf24f
Merge pull request from GHSA-hcqf-fw2r-52g4
...
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit 8891d8945d
.
* Revert "Do not normalize URL before fetching it (#26219 )"
This reverts commit fd284311e7
.
1 year ago
Claire
1cf501ddca
Merge pull request from GHSA-hcqf-fw2r-52g4
...
* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285 )"
This reverts commit da740ec43c
.
* Revert "Do not normalize URL before fetching it (#26219 )"
This reverts commit 266bbfc884
.
1 year ago
Kouhai
9d32bdbcde
th: Merge remote-tracking branch 'glitch/main'
1 year ago
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
1 year ago
Claire
c31020044b
Merge commit '38fe6ecd05e9349717b60452eff6e5ff4809b82b' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
1 year ago
Claire
5ed72f668f
Merge commit 'b90383d07388fe8513e59a6deb1a2391146c6561' into glitch-soc/merge-upstream
1 year ago
Claire
8c51fac1b6
Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream
1 year ago
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
1 year ago
Claire
296e8f791e
Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream
1 year ago
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
1 year ago
Claire
4127a9d9fe
Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream
1 year ago
Claire
6273416292
Fix post edits not being forwarded as expected ( #26936 )
1 year ago
Claire
38fe6ecd05
Fix post edits not being forwarded as expected ( #26936 )
1 year ago
Robert R George
20666482ef
Added admin api for managing tags ( #26872 )
1 year ago
Robert R George
6fb81e40fd
Added admin api for managing tags ( #26872 )
1 year ago
jsgoldstein
4d9186a48c
Add search tests ( #26703 )
1 year ago
jsgoldstein
d97f736733
Add search tests ( #26703 )
1 year ago
Eugen Rochko
3a679844e4
Fix `account_id`, `max_id` and `min_id` params not working in search ( #26847 )
1 year ago
Eugen Rochko
15ce240dae
Fix `account_id`, `max_id` and `min_id` params not working in search ( #26847 )
1 year ago
Claire
81caafbe84
Fix performances of profile directory ( #26842 )
1 year ago
Claire
d45dd56874
Fix performances of profile directory ( #26842 )
1 year ago
Claire
355e3fb529
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes ( #26840 )
1 year ago
Claire
aaa4b77b04
Simplify `Account.by_recent_status` and `Account.by_recent_sign_in` scopes ( #26840 )
1 year ago
Claire
1f99d86287
Fix blocked domain appears from account feed ( #26823 )
...
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
Claire
b6409b51a3
Fix blocked domain appears from account feed ( #26823 )
...
Co-authored-by: Jeong Arm <kjwonmail@gmail.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
1 year ago
Claire
b83e487502
Fix moderator rights inconsistencies ( #26729 )
1 year ago
Claire
bd83df7fd1
Fix moderator rights inconsistencies ( #26729 )
1 year ago
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
Claire
ef01aa71a9
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
Eugen Rochko
ece1ff77d6
Add `in:library` syntax to search ( #26760 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Eugen Rochko
a93f7392fd
Add `in:library` syntax to search ( #26760 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Christian Schmidt
ea31929776
Fix invalid Content-Type header for WebP images ( #26773 )
1 year ago
Christian Schmidt
e51426c1dc
Fix invalid Content-Type header for WebP images ( #26773 )
1 year ago
Claire
c107512fa6
Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream
1 year ago
Claire
78a851ae0a
Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream
1 year ago
Claire
4adb12ca91
Fix test failures due to different default settings in glitch-soc
1 year ago
Claire
f3f3294db5
Fix test failures due to different default settings in glitch-soc
1 year ago
Claire
ac2dae0d11
Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
1 year ago
Claire
432bd89f72
Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-releases.yml`:
Upstream changed comments close to a line we modified to account for
different container image repositories.
Updated the comments as upstream did.
1 year ago
Claire
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
1 year ago
Claire
a9fb03b6c0
Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream
1 year ago
Claire
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
1 year ago
Claire
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
1 year ago
Claire
16681e0f20
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
Claire
97238e3496
Add admin notifications for new Mastodon versions ( #26582 )
1 year ago
Eugen Rochko
e754083e8a
Fix unmatched quotes and prefixes causing search to fail ( #26701 )
1 year ago
Eugen Rochko
1f57ff8dd1
Fix unmatched quotes and prefixes causing search to fail ( #26701 )
1 year ago
Daniel M Brasil
ccca542db1
Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ( #26237 )
1 year ago
Daniel M Brasil
8ad87eeb93
Fix `/api/v1/timelines/tag/:hashtag` allowing for unauthenticated access when public preview is disabled ( #26237 )
1 year ago
Tyler Deitz
336ec503c2
Add avatar image to webfinger responses ( #26558 )
1 year ago
Tyler Deitz
a50d3d877f
Add avatar image to webfinger responses ( #26558 )
1 year ago
Eugen Rochko
2304cc6456
Fix bad search type heuristic ( #26673 )
1 year ago
Eugen Rochko
bafa60f5b9
Fix bad search type heuristic ( #26673 )
1 year ago
Kouhai
7c7355a964
th: Merge remote-tracking branch 'glitch/main' ( d033fab0ed
)
1 year ago
Claire
e3825a13c1
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )
1 year ago
Claire
a9a06f5ffe
Add PublicStatusesCheck to Elasticsearch index check on admin dashboard ( #26650 )
1 year ago
Claire
32e67e78a3
Merge commit 'e3fd07197379f1ac7fd4a761b3ff55effa1a2a6c' into glitch-soc/merge-upstream
1 year ago
Claire
a0c46afb82
Merge commit '87a88eefa865f80cf682a7fb45f594fab7c8242a' into glitch-soc/merge-upstream
1 year ago
Claire
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
1 year ago
Claire
17e93dbce5
Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
1 year ago
Claire
88ff45a3b2
Merge commit 'facfec1ba36cee27f232ebff90b990933719235a' into glitch-soc/merge-upstream
1 year ago
Claire
d0a26a2a16
Merge commit 'd4eef922aa794489a027575a560e4b09c68c153e' into glitch-soc/merge-upstream
1 year ago
Claire
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
1 year ago
Claire
1f30778ec6
Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
1 year ago
jsgoldstein
30c191aaa0
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
jsgoldstein
e82d84469e
Add new public status index ( #26344 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Daniel M Brasil
f337008819
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )
1 year ago
Daniel M Brasil
2e58f75da6
Fix timeout on invalid set of exclusionary parameters in `/api/v1/timelines/public` ( #26239 )
1 year ago
Claire
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
1 year ago
Claire
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
1 year ago
Nick Schonning
b970ed6098
Update rubocop and rubocop-rspec ( #26329 )
1 year ago
Nick Schonning
7f1b52c55f
Update rubocop and rubocop-rspec ( #26329 )
1 year ago
Claire
ac0eb0533e
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
1 year ago
Claire
0ce3130ef8
Add Elasticsearch cluster health check and indexes mismatch check to dashboard ( #26448 )
1 year ago
Claire
191d302b7f
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
1 year ago
Claire
5458629e60
Refactor `Api::V1::ProfilesController` into two separate controllers ( #26573 )
1 year ago
Daniel M Brasil
d24a87ce4f
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Daniel M Brasil
89d2b28e0b
Add ability to delete avatar or header picture via the API ( #25124 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
Renaud Chaput
b95867ad1f
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
1 year ago
Renaud Chaput
f4a6879caf
Allow setting a custom HTTP method in CacheBuster ( #26528 )
...
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
1 year ago
Claire
60b9fa641d
Fix cached posts including stale stats ( #26409 )
1 year ago
Claire
2e66d2562c
Fix cached posts including stale stats ( #26409 )
1 year ago
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
1 year ago
Claire
33024cca51
Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
1 year ago
Kouhai
f8028d190e
th: Merge remote-tracking branch 'glitch/main'
1 year ago