Thibaut Girka 571d219bb9 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts manually resolved:
- app/services/post_status_service.rb
- config/locales/simple_form.pl.yml
- config/routes.rb
- config/webpack/loaders/sass.js
- config/webpack/shared.js
- package.json
- yarn.lock

2019-01-02 15:36:53 +01:00

..

activitypub

Add specs for activitypub collections controller (#9484)

2018-12-10 21:39:25 +01:00

admin

Add moderation warnings (#9519)

2018-12-22 20:02:09 +01:00

api

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

2019-01-02 15:36:53 +01:00

auth

fix: Execute PAM authentication tests on CircleCI (#9029)

2018-10-20 17:28:04 +02:00

concerns

Add spec for AccountableConcern#log_action (#9559)

2018-12-18 16:43:03 +01: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

2018-12-15 10:45:53 +01:00

well_known

Serialize webfinger XML with Ox instead of Nokogiri (#7319)

2018-05-02 22:28:46 +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

Lint pass (#8876)

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

application_controller_spec.rb

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

2018-10-05 15:23:57 +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

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

remote_unfollows_controller_spec.rb

Lint pass (#8876)

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

shares_controller_spec.rb

Add tests for shares_controller (#7835)

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

statuses_controller_spec.rb

Fix thread depth computation in statuses_controller (#9426)

2018-12-05 02:12:29 +01:00

stream_entries_controller_spec.rb

Misc. typos (#8694)

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

tags_controller_spec.rb

Use raw status code on have_http_status (#7214)

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