treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/spec/controllers
History
Thibaut Girka 37e746eab6 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/accounts_controller.rb`:
  Upstream change too close to a glitch-soc change related to
  instance-local toots. Merged upstream changes.
- `app/services/fan_out_on_write_service.rb`:
  Minor conflict due to glitch-soc's handling of Direct Messages,
  merged upstream changes.
- `yarn.lock`:
  Not really a conflict, caused by glitch-soc-only dependencies
  being textually too close to updated upstream dependencies.
  Merged upstream changes.
 		2020-08-30 16:13:08 +02:00
..
activitypub Fix RSS feeds not being cachable (#14368) 2020-07-22 11:44:02 +02:00
admin Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2020-08-19 19:16:41 +02:00
auth Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
concerns Fix sr locale being selected over sr-Latn (#13693) 2020-05-11 01:09:21 +02:00
oauth Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) 2020-05-12 15:25:33 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-08-30 16:13:08 +02:00
well_known Fix webfinger returning wrong status code on malformed or missing param (#13759) 2020-05-14 23:28:06 +02:00
about_controller_spec.rb
…
account_follow_controller_spec.rb Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
account_unfollow_controller_spec.rb
…
accounts_controller_spec.rb Fix RSS feeds not being cachable (#14368) 2020-07-22 11:44:02 +02:00
application_controller_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
authorize_interactions_controller_spec.rb Optimize the process of following someone (#9220) 2018-11-08 21:05:42 +01:00
emojis_controller_spec.rb Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
follower_accounts_controller_spec.rb Hide blocked users from more places (#12733) 2019-12-31 00:55:32 +01:00
following_accounts_controller_spec.rb Hide blocked users from more places (#12733) 2019-12-31 00:55:32 +01:00
health_check_controller_spec.rb Add test for health_check endpoint 2020-02-10 20:04:41 +01:00
home_controller_spec.rb Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
intents_controller_spec.rb
…
invites_controller_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
manifests_controller_spec.rb
…
media_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
media_proxy_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb Add relationship manager UI (#10268) 2019-03-16 11:23:22 +01:00
remote_follow_controller_spec.rb Refactor monkey-patching of Goldfinger (#12561) 2020-05-10 11:41:43 +02: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_controller_spec.rb Fix RSS feeds not being cachable (#14368) 2020-07-22 11:44:02 +02:00
tags_controller_spec.rb Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00