Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml

2019-08-07 13:56:48 +02:00

..

activitypub

Add ActivityPub secure mode (#11269)

2019-07-11 20:11:09 +02:00

admin

Change admin UI for hashtags and add back whitelisted trends (#11490)

2019-08-05 19:54:29 +02:00

api

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

2019-07-23 10:51:07 +02:00

auth

Change unconfirmed user login behaviour (#11375)

2019-07-22 10:48:50 +02:00

concerns

Change locale detection to run once per session (#8657)

2019-07-21 18:08:02 +02:00

oauth

Add force_login option to OAuth authorize page (#8655)

2018-09-09 04:10:44 +02:00

settings

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

2019-08-07 13:56:48 +02:00

well_known

Remove XML version of Webfinger and remove links to Atom feeds (#11460)

2019-08-01 19:14:02 +02: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

Cover AccountFollowController more in spec (#3227)

2017-05-22 16:29:48 +02:00

account_unfollow_controller_spec.rb

Cover AccountUnfollowController more in spec (#3228)

2017-05-22 17:58:49 +02:00

accounts_controller_spec.rb

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

application_controller_spec.rb

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

2019-07-23 10:51:07 +02: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 tests for followers_accounts_controller (#7794)

2018-06-13 10:28:39 +09:00

following_accounts_controller_spec.rb

Add tests for following accounts controller (#7800)

2018-06-14 10:49:17 +09:00

home_controller_spec.rb

Redirect from Web tag timeline to public tag timeline if not signed in (#6633)

2018-03-05 19:29:36 +01: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

Use raw status code on have_http_status (#7214)

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

relationships_controller_spec.rb

Add relationship manager UI (#10268)

2019-03-16 11:23:22 +01:00

remote_follow_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

remote_interaction_controller_spec.rb

Add specs for RemoteInteractionController (#9524)

2018-12-14 20:36:40 +01:00

shares_controller_spec.rb

Add tests for shares_controller (#7835)

2018-06-18 10:45:20 +09:00

statuses_controller_spec.rb

Refactor controllers for statuses, accounts, and more (#11249)

2019-07-08 12:03:45 +02:00

tags_controller_spec.rb

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

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