Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
  Removed upstream, while it had glitch-soc-specific changes to accomodate
  for glitch-soc's theming system.
  Removed the file.

Additional changes:
- `app/views/admin/accounts/index.html.haml':
  Accomodate for glitch-soc's theming system.

2021-12-16 16:20:44 +01:00

..

activitypub

Fix followers synchronization mechanism not working when URI has empty path (#16744)

2021-09-15 18:51:16 +02:00

admin

Add batch suspend for accounts in admin UI (#17009)

2021-12-05 21:48:39 +01:00

api

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

2021-11-26 22:53:55 +01:00

auth

Fix webauthn secure key authentication (#16792)

2021-09-30 05:26:29 +02:00

concerns

Fix cache_collection crashing when given an empty collection (#15921)

2021-03-18 00:41:32 +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

2021-11-26 22:53:55 +01:00

well_known

Remove Keybase integration (#17045)

2021-11-26 05:58:18 +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

Prepare Mastodon for Rails 6 (#15911)

2021-03-17 10:09:55 +01:00

application_controller_spec.rb

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

2021-03-24 10:53:50 +01:00

authorize_interactions_controller_spec.rb

Change ResolveAccountService's handling of skip_webfinger (#15750)

2021-02-24 06:32:13 +01:00

emojis_controller_spec.rb

Misc. typos (#8694)

2018-09-14 00:53:09 +02:00

follower_accounts_controller_spec.rb

Fix serialization of followers/following counts when user hides their network (#16418)

2021-06-21 20:14:47 +02:00

following_accounts_controller_spec.rb

Fix serialization of followers/following counts when user hides their network (#16418)

2021-06-21 20:14:47 +02: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

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 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

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