about summary refs log tree commit diff
path: root/spec
AgeCommit message (Collapse)Author
2023-02-19Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.
2023-02-19Autofix Rubocop RSpec/EmptyLineAfterHook (#23718)Nick Schonning
2023-02-19Autofix Rubocop Style/StringLiterals (#23695)Nick Schonning
2023-02-19Autofix Rubocop RSpec/LetBeforeExamples (#23671)Nick Schonning
2023-02-19Autofix Rubocop Style/EmptyLambdaParameter (#23705)Nick Schonning
2023-02-19Autofix Rubocop RSpec/EmptyLineAfterFinalLet (#23707)Nick Schonning
2023-02-19Autofix Rubocop Style/BlockDelimiters (#23706)Nick Schonning
2023-02-19Autofix Rubocop RSpec/Capybara/FeatureMethods (#23708)Nick Schonning
2023-02-19Autofix Rubocop Style/TrailingCommaInArrayLiteral (#23692)Nick Schonning
2023-02-18Autofix Rubocop Style/TrailingCommaInHashLiteral (#23693)Nick Schonning
2023-02-18Autofix Rubocop RSpec/ExcessiveDocstringSpacing (#23666)Nick Schonning
2023-02-18Autofix Rubocop Style/TrailingCommaInArguments (#23694)Nick Schonning
2023-02-18Autofix Rubocop Style/IfUnlessModifier (#23697)Nick Schonning
2023-02-18Apply Rubocop Style/RedundantConstantBase (#23463)Nick Schonning
2023-02-18Autofix Rubocop Lint/ParenthesesAsGroupedExpression (#23682)Nick Schonning
2023-02-18Enable Rubocop RSpec/HooksBeforeExamples (#23668)Nick Schonning
2023-02-18Autofix Rubocop Style/RedundantPercentQ (#23651)Nick Schonning
2023-02-18Autofix Rubocop RSpec/ExampleWording (#23667)Nick Schonning
2023-02-18Enable Rubocop RSpec/MultipleDescribes (#23672)Nick Schonning
2023-02-18Autofix Rubocop RSpec/ClassCheck (#23685)Nick Schonning
2023-02-18Autofix Rubocop Lint/SymbolConversion (#23683)Nick Schonning
2023-02-18Autofix Rubocop Lint/AmbiguousOperator (#23680)Nick Schonning
2023-02-18Enable Rubocop Style/NumericLiterals (#23647)Nick Schonning
2023-02-18Run rubocop formatting except line length (#23632)Nick Schonning
2023-02-17Autofix Rubocop RSpec/EmptyLineAfterExample (#23661)Nick Schonning
2023-02-17Autofix Rubocop RSpec/BeNil (#23653)Nick Schonning
2023-02-17Autofix Rubocop Style/NestedParenthesizedCalls (#23646)Nick Schonning
2023-02-17Autofix Rubocop Style/MethodCallWithoutArgsParentheses (#23645)Nick Schonning
2023-02-14Add `memorial` attribute to REST API (#23591)Claire
2023-02-13Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.prettierignore`: Upstream added a line at the end, glitch-soc had extra entries at the end. Added upstream's new line before glitch-soc's. - `Gemfile.lock`: Upstream updated dependencies while glitch-soc has an extra one (hcaptcha). Updated dependencies like upstream did. - `app/controllers/api/v1/statuses_controller.rb`: Not a real conflict, upstream added a parameter (`allowed_mentions`) where glitch-soc already had an extra one (`content_type`). Added upstream's new parameter. - `app/javascript/styles/fonts/roboto-mono.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes. - `app/javascript/styles/fonts/roboto.scss`: A lot of lines were changed upstream due to code style changes, and a lot of those lines had path changes to accomodate glitch-soc's theming system. Applied upstream's style changes.
2023-02-13Add API parameter to safeguard unexpect mentions in new posts (#18350)Claire
2023-02-13Add tests to indicate inclusion of self replies in statuses endpoint (#23266)Varun Sharma
2023-02-13Add tests for `REST::AccountSerializer` (#23319)Claire
2023-02-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-10Fix unbounded recursion in post discovery (#23506)Claire
* Add a limit to how many posts can get fetched as a result of a single request * Add tests * Always pass `request_id` when processing `Announce` activities --------- Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
2023-02-09Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
2023-02-08Apply Rubocop Rails/WhereNot (#23448)Nick Schonning
* Apply Rubocop Rails/WhereNot * Update spec for where.not
2023-02-08Apply Rubocop Style/ExpandPathArguments (#23450)Nick Schonning
2023-02-07Autofix Rails/EagerEvaluationLogMessage (#23429)Nick Schonning
* Autofix Rails/EagerEvaluationLogMessage * Update spec for debug block syntax
2023-02-07Fix `UserCleanupScheduler` crash when an unconfirmed account has a ↵Claire
moderation note (#23318) * Fix `UserCleanupScheduler` crash when an unconfirmed account has a moderation note * Add tests
2023-02-03Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.
2023-02-02Change `POST /settings/applications/:id` to regenerate token on scopes ↵Claire
change (#23359) Fixes #23096
2023-01-26Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-25Add `roles` attribute to Account entities in REST API (#23255)Claire
2023-01-24Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-24Fix email with empty domain name labels passing validation (#23246)Claire
* Fix email with empty domain name labels passing validation `EmailMxValidator` would allow empty labels because `Resolv::DNS` is particularly lenient about them, but the email would be invalid and unusable. * Add tests
2023-01-24Fix account activation being triggered before email confirmation (#23245)Claire
* Add tests * Fix account activation being triggered before email confirmation Fixes #23098
2023-01-23Suppress AddressFamilyError in link verification (#23204)Markus Unterwaditzer
* Suppress AddressFamilyError * clarify comment
2023-01-23Add missing `policy` attribute to `WebPushSubscriptionSerializer` (#23210)Claire
* Add missing `policy` attribute to `WebPushSubscriptionSerializer` Fixes #23145 * Add tests
2023-01-18Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `config/i18n-tasks.yml`: Upstream added new ignored strings, glitch-soc has extra ignored strings because of the theming system. Added upstream's changes.
generated by cgit-pink (git 2.37.1) at 2024-11-25 15:53:55 +0000