about summary refs log tree commit diff
path: root/app/models
AgeCommit message (Collapse)Author
2023-03-15Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.github/workflows/build-image.yml`: Upstream switched to pushing to both DockerHub and GitHub Container Repository, while glitch-soc was already pushing to the latter only. Updated our configuration to be slightly more consistent with upstream's naming and styling, but kept our behavior. - `Gemfile.lock`: Updated dependencies textually too close to glitch-soc only hcaptcha dependency. Updated dependencies as upstream did. - `README.md`: Upstream updated its README, but we have a completely different one. Kept our README, though it probably should be reworked at some point. - `app/views/auth/sessions/two_factor.html.haml`: Minor style fix upstream that's on a line glitch-soc removed because of its different theming system. Kept our file as is. - `spec/controllers/health_controller_spec.rb`: This file apparently did not exist upstream, upstream created it with different contents but it is functionally the same. Switched to upstream's version of the file. - `spec/presenters/instance_presenter_spec.rb`: Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc had its own code because it's a fork and does not have the same default source URL. Took upstream's change, but with glitch-soc's repo as the default case. - `yarn.lock`: Upstream dependencies textually too close to a glitch-soc only one. Updated dependencies as upstream did.
2023-03-06Fix unconfirmed accounts being registered as active users (#23803)Claire
2023-03-05Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream README has been changed, but we have a completely different one. Kept our `README.md`. - `lib/sanitize_ext/sanitize_config.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Change the code style to match upstream's but otherwise do not change our code. - `spec/lib/sanitize_config_spec.rb`: Upstream added support for more incoming HTML tags (a large subset of what glitch-soc accepts). Kept our version, since the tests are mostly glitch-soc's, except for cases which are purposefuly different.
2023-03-04Upgrade to latest redis-rb 4.x and fix deprecations (#23616)Jean byroot Boussier
Co-authored-by: Jean Boussier <jean.boussier@gmail.com>
2023-03-03Only offer translation for supported languages (#23879)Christian Schmidt
2023-03-03Fix external authentication not running onboarding code for new users (#23458)Claire
2023-03-03Fix server error when failing to follow back followers from `/relationships` ↵Claire
(#23787)
2023-03-03Fix “Remove all followers from the selected domains” being more ↵Claire
destructive than it claims (#23805)
2023-03-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-03-02Fix deprecation warning about merging conditions (#23618)Matt Jankowski
2023-02-27Fix single-record invalid condition on PollVote (#23810)Matt Jankowski
2023-02-25Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.
2023-02-22Fix inefficiency when searching accounts per username in admin interface ↵Claire
(#23801)
2023-02-21Autofix Rubocop Rails/WhereEquals (#23759)Nick Schonning
2023-02-20Autofix Rubocop remaining Layout rules (#23679)Nick Schonning
2023-02-20Autofix Rubocop Style/UnpackFirst (#23741)Nick Schonning
2023-02-20Autofix Rubocop Rails/EnumHash (#23737)Nick Schonning
2023-02-20Autofix Rubocop Rails/RedundantForeignKey (#23731)Nick Schonning
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 Style/RedundantBegin (#23703)Nick Schonning
2023-02-18Autofix Rubocop Style/Lambda (#23696)Nick Schonning
2023-02-18Autofix Rubocop Style/IfUnlessModifier (#23697)Nick Schonning
2023-02-18Autofix Rubocop Lint/AmbiguousOperatorPrecedence (#23681)Nick Schonning
2023-02-18Run rubocop formatting except line length (#23632)Nick Schonning
2023-02-15Upgrade to Ruby 3.2 (#22928)Aaron Patterson
Co-authored-by: Matthew Ford <matt@bitzesty.com>
2023-02-10Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-02-10Fix admin-set follow recommandations being case-sensitive (#23500)Claire
Fixes #23472
2023-02-10Fix server status URL being a required server setting (#23499)Claire
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 Performance/BlockGivenWithExplicitBlock (#23441)Nick Schonning
* Apply Rubocop Performance/BlockGivenWithExplicitBlock * Unprefix used block parameter
2023-02-08Apply Rubocop Style/NegatedIfElseCondition (#23451)Nick Schonning
2023-02-08Apply Rubocop Style/RedundantAssignment (#23452)Nick Schonning
2023-02-08Apply Rubocop Performance/RedundantBlockCall (#23440)Nick Schonning
2023-02-07Autofix Rails/EagerEvaluationLogMessage (#23429)Nick Schonning
* Autofix Rails/EagerEvaluationLogMessage * Update spec for debug block syntax
2023-02-04Add setting for status page URL (#23390)Eugen Rochko
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 account activation being triggered before email confirmation (#23245)Claire
* Add tests * Fix account activation being triggered before email confirmation Fixes #23098
2023-01-21Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-01-21Fix Account Strike causing PG not null validation error (#23178)Jeong Arm
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.
2023-01-18Add option to make the landing page be /about even when trends are enabled ↵Claire
(#20808) * Add option to make the landing page be /about even when trends are enabled * Restablish /explore as landing page by default
2023-01-18Add confirmation screen when handling reports (#22375)Claire
* Add confirmation screen on moderation actions * Add flash notice when a report has been processed * Refactor tests * Add tests
2023-01-18Fix situations in which instance actor can be set to a Mastodon-incompatible ↵Claire
name (#22307) * Validate internal actor * Use “internal.actor” by default for the server actor username * Fix instance actor username on the fly if it includes ':' * Change actor name from internal.actor to mastodon.internal
2023-01-18Change domain block CSV parsing to be more robust and handle more lists (#21470)Claire
* Change domain block CSV parsing to be more robust and handle more lists * Add some tests * Improve domain block import validation and reporting
2023-01-14Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/views/layouts/mailer.html.haml`: Upstream removed a line close to one modified by glitch-soc. Removed the line as upstream did.
2023-01-13Don't crash on unobtainable avatars (#22462)David Freedman
2023-01-13Fix crash when marking statuses as sensitive while some statuses are deleted ↵Claire
(#22134) * Do not offer to mark statuses as sensitive if there is no undeleted status with media attachments * Fix crash when marking statuses as sensitive while some statuses are deleted Fixes #21910 * Fix multiple strikes being created for a single report when selecting “Mark as sensitive” * Add tests
generated by cgit-pink (git 2.37.1) at 2025-02-18 04:41:27 +0000