Thibaut Girka 45fce0e496 Merge branch 'master' into glitch-soc/merge ...

Conflicts:
	app/controllers/invites_controller.rb
	app/serializers/initial_state_serializer.rb
	config/locales/ko.yml

2018-05-11 18:12:42 +02:00

..

activitypub

Use raw status code on have_http_status (#7214)

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

admin

Add tests for admin/roles_controller (#7421)

2018-05-09 08:41:46 +02:00

api

Merge branch 'master' into glitch-soc/merge

2018-05-11 18:12:42 +02:00

auth

Reset locale on registration tests (#7219)

2018-04-21 23:37:07 +02:00

concerns

Fix randomly fail (similar #7219) (#7225)

2018-04-22 11:41:39 +02:00

oauth

Use raw status code on have_http_status (#7214)

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

settings

Merge remote-tracking branch 'origin/master' into gs-master

2018-05-03 17:23:44 -05:00

well_known

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

2018-05-02 22:28:46 +02:00

about_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +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

Use raw status code on have_http_status (#7214)

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

application_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

authorize_follows_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

follower_accounts_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

following_accounts_controller_spec.rb

Use raw status code on have_http_status (#7214)

2018-04-21 21:35:07 +02: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

invites_controller_spec.rb

Add tests for invites controller (#7441)

2018-05-11 13:14:33 +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

statuses_controller_spec.rb

Paginate descendant statuses in public page (#7148)

2018-04-23 19:27:35 +02:00

stream_entries_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

tags_controller_spec.rb

Use raw status code on have_http_status (#7214)

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