CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
bf1d3ae3b8
puyopuyotetr.is/spec/controllers
History
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream 
Manually-resolved conflicts:
	.circleci/config.yml
	app/controllers/accounts_controller.rb
	app/controllers/auth/passwords_controller.rb
	app/controllers/statuses_controller.rb
	app/javascript/packs/public.js
	app/models/media_attachment.rb
	app/views/stream_entries/_content_spoiler.html.haml
	app/views/stream_entries/_media.html.haml
	config/locales/en.yml
	config/locales/ja.yml
	config/locales/pl.yml
	lib/mastodon/version.rb

Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.

Translation strings for glitch-soc's keyword mutes were dropped.

Everything else was mostly “take both”.
2018-08-01 00:18:13 +02:00
..
activitypub Use raw status code on have_http_status (#7214) 2018-04-21 21:35:07 +02:00
admin Add missing tests for admin/accounts_controller (#7791) 2018-06-12 21:24:46 +09:00
api Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
auth Add missing tests for confirmations controller (#7866) 2018-06-21 10:40:23 +09: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 Migrate glitch-soc keyword mutes to Mastodon's 2018-07-09 19:19:23 +02: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 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 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 tests for intents_controller (#7763) 2018-06-09 22:47:50 +02: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
remote_unfollows_controller_spec.rb Add tests for remote_unfollows_controller (#7879) 2018-06-24 19:55:55 +09:00
shares_controller_spec.rb Add tests for shares_controller (#7835) 2018-06-18 10:45:20 +09: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