mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity
donphan/spec
History
Claire 75580360cd Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream fixed a bunch lint issues, and changed the `Max` parameter of the
  `Metrics/AbcSize` cop.
  Glitch-soc has different code and slightly higher `AbcSize` complexity,
  modified the `.rubocop_todo.yml` file accordingly.
- `app/policies/status_policy.rb`:
  Upstream changed `account.suspended?` to `account.unavailable?` to prepare
  for delete flags. Glitch-soc has additional local-only conditions.
  Ported upstream's refactor while keeping glitch-soc's additional condition.
- `app/serializers/initial_state_serializer.rb`:
  Upstream refactored a bunch of stuff while glitch-soc has more settings.
  Refactored as upstream did while keeping glitch-soc's settings.
 		2023-12-20 22:05:31 +01:00
..
chewy Add new public status index (#26344) 2023-08-24 16:40:04 +02:00
config/initializers/rack Fix `RSpec/SpecFilePathFormat` cops (#27730) 2023-11-06 16:25:40 +00:00
controllers Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
fabrication Restore console behavior in `test` env (#26401) 2023-08-09 11:26:56 +02:00
fabricators Remove `default_scope` from `Admin::ActionLog` (#28026) 2023-11-29 10:39:59 +00:00
features Stub controller methods and remove `rubocop:disable` in captcha feature spec (#27743) 2023-11-07 09:15:30 +00:00
fixtures Remove unused stub json ld context (#25454) 2023-10-16 15:38:27 +02:00
generators Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
helpers Merge commit 'a36b59be8ad7656b7ceab9751c9ec5b3563e3a30' into glitch-soc/merge-upstream 2023-12-18 19:10:43 +01:00
lib Merge commit '85662a5a57531af5402a6777d0b1089e78c56815' into glitch-soc/merge-upstream 2023-12-20 20:10:45 +01:00
locales Replace i18n view spec with helper spec (#24966) 2023-05-15 17:25:04 +02:00
mailers Add missing email previews for `AdminMailer` (#28044) 2023-11-23 12:32:50 +00:00
models Merge commit '272592d16d40e804ec325ef3b5e6de9bbad5f2dd' into glitch-soc/merge-upstream 2023-12-20 22:05:31 +01:00
policies Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
presenters Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
requests Merge commit '0530ce5e9575c09464847412f43852f438b0494e' into glitch-soc/merge-upstream 2023-12-20 21:58:18 +01:00
routing Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
search/models/concerns/account Model concerns organization into module namespaces (#28149) 2023-12-01 11:00:41 +00:00
serializers Add VAPID public key to instance serializer (#28006) 2023-11-29 08:34:36 +00:00
services Remove `default_scope` from `MediaAttachment` class (#28043) 2023-11-30 13:30:35 +00:00
support Configure elastic search integration with rspec tag (#27882) 2023-11-17 11:52:20 +00:00
system Fixes website not loading for unlogged users (#27698) 2023-11-04 21:52:56 +00:00
validators Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
views Fix `RSpec/MetadataStyle` cop in spec/ (#27729) 2023-11-06 14:28:20 +00:00
workers Consolidate configuration of `Sidekiq::Testing.fake!` setup (#28046) 2023-11-23 09:43:43 +00:00
rails_helper.rb Consolidate configuration of `Sidekiq::Testing.fake!` setup (#28046) 2023-11-23 09:43:43 +00:00
spec_helper.rb Disable simplecov `enable_coverage_for_eval` option, move to standalone file (#27869) 2023-11-15 23:09:31 +00:00