David Yip 3550470c18 Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.		2018-06-02 16:15:36 -05:00
..
activitypub	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
admin	Add tests for report notes controller (#7589)	2018-05-22 14:45:10 +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	Ensure push subscription is immediately removed when application is revoked (#7548)	2018-05-19 21:05:08 +02:00
settings	Merge remote-tracking branch 'origin/master' into gs-master	2018-06-02 16:15:36 -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
account_unfollow_controller_spec.rb
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
emojis_controller_spec.rb	Add a test for emojis_controller (#7652)	2018-05-28 22:56:58 +09: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	Fix tests for invites controller (regression from 4d81809f36) (#7597)	2018-05-23 06:32:10 +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