about summary refs log tree commit diff
path: root/spec
AgeCommit message (Collapse)Author
2023-03-31Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.
2023-03-31Wrong type for user setting when default is defined by lambda (#24321)Christian Schmidt
2023-03-30Change user settings to be stored in a more optimal way (#23630)Eugen Rochko
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-03-29Requeue expiration notification (#24311)Christian Schmidt
2023-03-25Change media upload limits and remove client-side resizing (#23726)Eugen Rochko
2023-03-22Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `app/models/status.rb`: Upstream added lines close to a glitch-soc only line, not a real conflict. Applied upstream's changes (added hooks) while keeping glitch-soc's changes (`local_only` scope). - `config/environments/production.rb`: Upstream removed a header, while we have glitch-soc specific ones. Removed the header removed upstream.
2023-03-22Add specs for Chewy importers (#24204)Matt Jankowski
2023-03-16Merge branch 'main' into glitch-soc/merge-upstreamClaire
Conflicts: - `README.md`: Upstream changed their README, we have our own. Kept ours. - `app/helpers/application_helper.rb`: Minor code style fix upstream, on a line that is different in glitch-soc due to the different theming system. Applied the code style fix to our own code. - `app/views/settings/preferences/appearance/show.html.haml`: Code style fix on a line next to lines exclusive to glitch-soc. Applied upstream changes. - `yarn.lock`: Upstream updated a dependency textually close to a glitch-soc-only dependency. Updated the dependency like upstream did.
2023-03-16Replace `Status#translatable?` with language matrix in separate endpoint ↵Christian Schmidt
(#24037)
2023-03-16Autofix Rubocop Style/PreferredHashMethods (#23851)Nick Schonning
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-15Fix misleading error code when receiving invalid WebAuthn credentials (#23568)Claire
2023-03-15Add spec for the CLI `version` task (#23978)Matt Jankowski
2023-03-10Add basic search specs for chewy indexes (#24065)Matt Jankowski
2023-03-10Coverage improvement round-out following up previous work (#23987)Matt Jankowski
2023-03-10Serializers spec coverage (#24017)Matt Jankowski
2023-03-09Explicitly set github repo in instance presenter spec (#24036)Matt Jankowski
2023-03-08Unescape HTML entities (#24019)Christian Schmidt
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-04Fix spec for api/v1/statuses/translations (#23956)Matt Jankowski
2023-03-04Restore missing fabricators (#23951)Matt Jankowski
2023-03-04Pending example models minimal coverage (#23912)Matt Jankowski
2023-03-04User mailer spec coverage improvements (#23905)Matt Jankowski
2023-03-04Admin controllers specs (#23917)Matt Jankowski
2023-03-04Specs api v1 controllers (#23930)Matt Jankowski
2023-03-04Fabricator specs (#23925)Matt Jankowski
2023-03-04Misc coverage improvements for validators (#23928)Matt Jankowski
2023-03-04Helpers specs coverage improvement (#23937)Matt Jankowski
2023-03-04Policies specs (#23924)Matt Jankowski
2023-03-04Settings controllers specs (#23915)Matt Jankowski
2023-03-04Add basic coverage for some worker jobs (#23943)Matt Jankowski
2023-03-04Models specs coverage (#23940)Matt Jankowski
2023-03-03Only offer translation for supported languages (#23879)Christian Schmidt
2023-03-03Add tests for moderation actions without custom text (#23184)Claire
2023-03-03Fix “Remove all followers from the selected domains” being more ↵Claire
destructive than it claims (#23805)
2023-03-03Add support for incoming rich text (#23913)Claire
2023-03-02Merge branch 'main' into glitch-soc/merge-upstreamClaire
2023-03-02Fix deprecation warning about merging conditions (#23618)Matt Jankowski
2023-03-02Update rspec-rails to version 6.0.1 (#23908)Matt Jankowski
2023-03-02Add spec coverage for Admin::Trends::StatusesHelper (#23898)Matt Jankowski
2023-03-02Add rspecs for FollowRecommendationsScheduler (#23890)Stanislav Dobrovolschii
2023-03-02Spec coverage for HomeHelper (#23907)Matt Jankowski
2023-02-28Admin mailer spec coverage improvement (#23863)Matt Jankowski
2023-02-27Add policies and serializers groups to simplecov output (#23897)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-23Rename ActivityPub Serializer Specs (#23844)Nick Schonning
2023-02-23Change auto-deletion throttling constants to better scale with server size ↵Claire
(#23320)
2023-02-23Fix mispelled spec filenames (#23834)Nick Schonning
2023-02-22Fix rack:attack flaky tests and test end of throttle period (#23799)Claire