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

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml

2019-04-01 21:28:31 +02:00

..

accounts

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

2019-04-01 21:28:31 +02:00

apps

…

instances

Add specs for Api::V1::Instances::PeersController (#9546)

2018-12-17 11:35:55 +01:00

lists

…

polls

Add polls (#10111)

2019-03-03 22:18:23 +01:00

push

…

statuses

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

2018-10-05 15:23:57 +02:00

timelines

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

accounts_controller_spec.rb

Add REST API for creating an account (#9572)

2018-12-24 19:12:38 +01:00

apps_controller_spec.rb

…

blocks_controller_spec.rb

…

bookmarks_controller_spec.rb

…

conversations_controller_spec.rb

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

custom_emojis_controller_spec.rb

…

domain_blocks_controller_spec.rb

…

endorsements_controller_spec.rb

Add spec for Api::V1::EndorsementsController (#9543)

2018-12-17 11:32:44 +01:00

favourites_controller_spec.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

filters_controller_spec.rb

Add polls (#10111)

2019-03-03 22:18:23 +01:00

follow_requests_controller_spec.rb

…

follows_controller_spec.rb

…

instances_controller_spec.rb

…

lists_controller_spec.rb

…

media_controller_spec.rb

Not to skip executable specs (#9753)

2019-01-10 15:12:31 +01:00

mutes_controller_spec.rb

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

2018-08-27 18:09:28 +02:00

notifications_controller_spec.rb

Add scheduled statuses (#9706)

2019-01-05 12:43:28 +01:00

polls_controller_spec.rb

Add polls (#10111)

2019-03-03 22:18:23 +01:00

reports_controller_spec.rb

Support min_id-based pagination in REST API (#8736)

2018-09-28 02:23:45 +02:00

search_controller_spec.rb

…

statuses_controller_spec.rb

…

streaming_controller_spec.rb

Lint pass (#8876)

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

suggestions_controller_spec.rb

…