monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec
History
Claire 86c9c5afa0 Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Upstream changed the order of Action Controller filters for web app
  controllers.
  Glitch-soc has an extra filter due to its theming system.
  Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to an extra newline in glitch-soc.
  Removed that newline and applied upstream's changes.
 		2023-10-08 17:26:43 +02:00
..
chewy Add new public status index (#26344) 2023-08-24 16:40:04 +02:00
config/initializers Fix RSpec/ContextWording cop (#24739) 2023-05-04 05:49:08 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
fabrication Restore console behavior in `test` env (#26401) 2023-08-09 11:26:56 +02:00
fabricators Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
features Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
fixtures Spec media attachment speedups (#25416) 2023-08-07 17:58:12 +02:00
generators Clean up the post deployment migration generator (#24233) 2023-04-11 11:25:29 +02:00
helpers Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
lib Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
locales Replace i18n view spec with helper spec (#24966) 2023-05-15 17:25:04 +02:00
mailers Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
models Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream 2023-10-08 17:21:12 +02:00
policies Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
presenters Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 2023-06-10 16:48:01 +02:00
requests Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream 2023-10-08 17:26:43 +02:00
routing Enable Style/FrozenStringLiteralComment for specs (#23790) 2023-02-22 09:55:31 +09:00
search/models/concerns Add search tests (#26703) 2023-09-08 16:17:55 +02:00
serializers Update rubocop-rspec to version 2.22.0, fix `RSpec/IndexedLet` cop (#24698) 2023-06-14 16:44:37 +02:00
services Fix post edits not being forwarded as expected (#26936) 2023-09-15 19:54:32 +02:00
support Add end-to-end (system) tests (#25461) 2023-07-28 23:09:49 +02:00
system Add end-to-end (system) tests (#25461) 2023-07-28 23:09:49 +02:00
validators Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream 2023-08-11 22:15:41 +02:00
views/statuses Update rubocop and rubocop-rspec (#26329) 2023-08-22 09:31:40 +02:00
workers Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
rails_helper.rb Add search tests (#26703) 2023-09-08 16:17:55 +02:00
spec_helper.rb Add search tests (#26703) 2023-09-08 16:17:55 +02:00