monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/controllers
History
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
 		2022-06-28 11:11:18 +02:00
..
activitypub Spelling (#17705) 2022-03-06 22:51:40 +01:00
admin Add confirmation page when importing blocked domains (#1773) 2022-05-16 18:26:49 +02:00
api Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +02:00
auth Fix suspicious sign-in mails never being sent (#18599) 2022-06-21 15:16:22 +02:00
concerns Fix single Redis connection being used across all threads (#18135) 2022-04-28 17:47:34 +02:00
disputes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
oauth Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) 2020-05-12 15:25:33 +02:00
settings Merge branch 'main' into glitch-soc/merge-upstream 2022-06-02 09:49:38 +02:00
well_known Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
about_controller_spec.rb
…
account_follow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
account_unfollow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
accounts_controller_spec.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
application_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-03-08 20:22:54 +01:00
authorize_interactions_controller_spec.rb Refactor and improve tests (#17386) 2022-01-28 00:46:42 +01:00
emojis_controller_spec.rb
…
follower_accounts_controller_spec.rb Add `/api/v1/accounts/familiar_followers` to REST API (#17700) 2022-03-07 09:36:47 +01:00
following_accounts_controller_spec.rb Add `/api/v1/accounts/familiar_followers` to REST API (#17700) 2022-03-07 09:36:47 +01:00
health_controller_spec.rb Fix glitch-soc-specific health check spec 2021-04-05 15:21:38 +02:00
home_controller_spec.rb Change routing paths to use usernames in web UI (#16171) 2021-09-26 05:46:13 +02:00
instance_actors_controller_spec.rb Fix instance actor not being dereferenceable (#17457) 2022-02-06 15:31:03 +01:00
intents_controller_spec.rb
…
invites_controller_spec.rb
…
manifests_controller_spec.rb
…
media_controller_spec.rb Fix error when rendering public pages with media attachments (#16763) 2021-10-13 15:27:19 +02:00
media_proxy_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb Remove PubSubHubbub-related columns from accounts table (#16170) 2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
remote_interaction_controller_spec.rb Add specs for RemoteInteractionController (#9524) 2018-12-14 20:36:40 +01:00
shares_controller_spec.rb Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
statuses_cleanup_controller_spec.rb Add feature to automatically delete old toots (#16529) 2021-08-09 23:11:50 +02:00
statuses_controller_spec.rb Spelling (#17705) 2022-03-06 22:51:40 +01:00
tags_controller_spec.rb Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00