tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
a9515f3186b49df63436b98d382ee6a6b755387d
Mastodon/spec/controllers
T
History
David Yip 8142bd2553 Merge remote-tracking branch 'tootsuite/master' into merge-upstream 
Conflicts:
 	app/models/status.rb

The conflict in the Status model was due to
https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3.
It was resolved by accepting tootsuite's changes.
2018-06-07 05:13:49 -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 remote-tracking branch 'tootsuite/master' into merge-upstream
2018-06-07 05:13:49 -05: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 'tootsuite/master' into merge-upstream
2018-06-07 05:13:49 -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