treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec
History
Claire bf153b384b Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
  Upstream refactored, changing lines textually close of glitch-soc-only lines
  pertaining to the theming system.
  Resolved the conflict.
 		2024-01-27 19:06:41 +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 '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream 2024-01-25 19:51:19 +01:00
fabrication Restore console behavior in `test` env (#26401) 2023-08-09 11:26:56 +02:00
fabricators Move followable_by coverage to suggestions (#28697) 2024-01-12 09:11:34 +00:00
features Add tests for redirect confirmations (#28903) 2024-01-25 11:13:33 +00:00
fixtures Add spec coverage for `CLI::Emoji` class (#28182) 2023-12-06 08:52:30 +00:00
generators Fix flaky tests related to file creation (#28248) 2023-12-06 22:22:25 +00:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
lib Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream 2024-01-26 20:47:20 +01:00
locales
…
mailers Add notification email on invalid second authenticator (#28822) 2024-01-22 13:55:43 +00:00
models Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream 2024-01-27 19:06:41 +01:00
policies Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream 2024-01-15 20:53:16 +01:00
presenters Merge branch 'main' into glitch-soc/merge-upstream 2023-12-28 16:57:10 +01:00
requests Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream 2024-01-22 19:19:40 +01:00
routing
…
search/models/concerns/account Use Sidekiq `fake!` instead of `inline!` in specs (#25369) 2024-01-10 11:06:58 +00:00
serializers Add VAPID public key to instance serializer (#28006) 2023-11-29 08:34:36 +00:00
services Fix remaining `Rails/WhereExists` cop violations, regenerate todo (#28892) 2024-01-25 12:37:07 +00:00
support Use top-level `warn` in JS errors check (#28745) 2024-01-15 21:26:11 +00:00
system Use Sidekiq `fake!` instead of `inline!` in specs (#25369) 2024-01-10 11:06:58 +00:00
validators Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream 2024-01-10 17:51:12 +01:00
views Fix `RSpec/MetadataStyle` cop in spec/ (#27729) 2023-11-06 14:28:20 +00:00
workers Disable `Rails/SkipsModelValidations` cop (#28712) 2024-01-15 13:46:47 +00:00
rails_helper.rb Move streaming `around` config into manager class (#28684) 2024-01-11 10:54:42 +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