monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec
History
Claire 077e0c6812 Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Conflict caused by the `json` gem thing once again.
  Updated as upstream did, but keeping the most recent `json` version.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored a bunch of specs, including one place that differs
  because of glitch-soc's theming system.
  Refactored as upstream did, adapting it for glitch-soc's theming system.
 		2023-12-20 22:16:50 +01:00
..
chewy
…
config/initializers/rack
…
controllers Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
fabrication
…
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 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 commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
lib Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
locales
…
mailers Add missing email previews for `AdminMailer` (#28044) 2023-11-23 12:32:50 +00:00
models Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
policies
…
presenters Merge commit '1526e54ac6f08431c8c833f20b4be8882355967c' into glitch-soc/merge-upstream 2023-12-19 20:24:57 +01:00
requests Merge commit '0b4a3a04378ce43f2f314b9446b5053f6b374c6d' into glitch-soc/merge-upstream 2023-12-20 22:16:50 +01:00
routing
…
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 double subject call in `services/delete_account_service` spec (#28212) 2023-12-06 08:51:09 +00:00
support Fix `Style/SuperWithArgsParentheses` cop (#28174) 2023-12-01 15:53:15 +00:00
system
…
validators Merge commit 'b87bfb8c96c8491f1228e0258d05119f3420db05' into glitch-soc/merge-upstream 2023-12-18 18:34:25 +01:00
views
…
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