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

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

2018-10-01 12:43:20 +02:00

..

v1

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

2018-10-01 12:43:20 +02:00

v2

Add more granular OAuth scopes (#7929)

2018-07-05 18:31:35 +02:00

web

Add tests for embeds controller (#7719)

2018-06-04 10:35:56 +09:00

base_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

oembed_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

push_controller_spec.rb

Use raw status code on have_http_status (#7214)

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

salmon_controller_spec.rb

Update Rails (#8141)

2018-08-13 18:17:20 +02:00

subscriptions_controller_spec.rb

Update Rails (#8141)

2018-08-13 18:17:20 +02:00