Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/public_feed.rb`:
  Upstream refactored a bit, glitch-soc had specific code for local-only
  statuses.
  Updated glitch-soc's specific code accordingly.

2021-01-11 11:55:42 +01:00

..

activitypub

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00

admin

Fix performance on instances list in admin UI (#15282)

2020-12-14 09:06:34 +01:00

api

Merge branch 'master' into glitch-soc/merge-upstream

2021-01-11 11:55:42 +01:00

auth

Fix external user creation failing when invite request text is required (#15405)

2020-12-22 17:14:32 +01:00

concerns

Change account suspensions to be reversible by default (#14726)

2020-09-15 14:37:58 +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-11-20 13:27:48 +01:00

well_known

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00

about_controller_spec.rb

Compensate for scrollbar disappearing when media modal visible (#8100)

2018-07-31 01:14:33 +02:00

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

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01: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

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00

following_accounts_controller_spec.rb

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +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

Add remote interaction dialog for toots (#8202)

2018-08-18 03:03:12 +02:00

invites_controller_spec.rb

Lint pass (#8876)

2018-10-04 12:36:53 +02:00

manifests_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02:00

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

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_controller_spec.rb

Add support for reversible suspensions through ActivityPub (#14989)

2020-11-08 00:28:39 +01:00

tags_controller_spec.rb

Redesign public hashtag page to use a masonry layout (#9822)

2019-01-16 19:47:46 +01:00