monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/controllers
History
Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Changes were already cherry-picked and updated further in glitch-soc.
  Kept glitch-soc's version.
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept glitch-soc's README.
- `app/models/account.rb`:
  Not a real conflict, upstream updated some lines textually adjacent
  to glitch-soc-specific lines.
  Ported upstream's changes.
 		2024-02-24 14:46:14 +01:00
..
activitypub Reduce request/response round-trips in ap/collections controller spec (#29102) 2024-02-06 13:10:00 +00:00
admin Reduce round trips in admin/disputes/appeals spec (#29234) 2024-02-16 13:46:28 +00:00
api Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream 2024-02-24 14:15:49 +01:00
auth Reduce round trips in auth/sessions spec (#29233) 2024-02-16 13:38:49 +00:00
concerns Combine repeated requests in account controller concern spec (#28957) 2024-01-30 15:32:20 +00:00
disputes Reduce round trips in disputes/appeals spec (#29232) 2024-02-16 13:01:15 +00:00
filters
…
oauth Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446) 2023-12-21 09:28:41 +00:00
settings Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
.rubocop.yml
…
about_controller_spec.rb
…
application_controller_spec.rb Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream 2024-02-24 14:02:01 +01:00
authorize_interactions_controller_spec.rb
…
custom_css_controller_spec.rb
…
emojis_controller_spec.rb
…
filters_controller_spec.rb
…
follower_accounts_controller_spec.rb Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446) 2023-12-21 09:28:41 +00:00
following_accounts_controller_spec.rb Clean up of `RSpec/LetSetup` within `spec/controllers` (#28446) 2023-12-21 09:28:41 +00:00
health_controller_spec.rb
…
home_controller_spec.rb
…
instance_actors_controller_spec.rb Reduce `RSpec/MultipleExpectations` in instance_actors_controller spec (#29229) 2024-02-16 13:00:11 +00:00
intents_controller_spec.rb
…
invites_controller_spec.rb
…
manifests_controller_spec.rb
…
media_controller_spec.rb
…
media_proxy_controller_spec.rb
…
privacy_controller_spec.rb
…
relationships_controller_spec.rb
…
shares_controller_spec.rb
…
statuses_cleanup_controller_spec.rb
…
statuses_controller_spec.rb
…
tags_controller_spec.rb
…