luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-10 08:54:40 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/spec/lib
History
Thibaut Girka dcded13a99 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- .github/ISSUE_TEMPLATE/bug_report.md
  Took our version.
- CONTRIBUTING.md
  Updated the embedded copy of upstream's version.
- README.md
  Took our version.
- app/policies/status_policy.rb
  Not a real conflict, took code from both.
- app/views/layouts/embedded.html.haml
  Added upstream's changes (dns-prefetch) and fixed
  `%body.embed`
- app/views/settings/preferences/show.html.haml
  Reverted some of upstream changes, as we have a
  page dedicated for flavours and skins.
- config/initializers/content_security_policy.rb
  Kept our version of the CSP.
- config/initializers/doorkeeper.rb
  Not a real conflict, took code from both.
2018-10-22 17:51:38 +02:00
..
activitypub Improve support for aspects/circles (#8950) 2018-10-17 17:13:04 +02:00
ostatus rubocop issues - Cleaning up (#8912) 2018-10-08 04:50:11 +02:00
settings Add a test for Settings::Extend#settings (#5720) 2017-11-19 04:15:32 +01:00
delivery_failure_tracker_spec.rb After 7 days of repeated delivery failures, give up on inbox (#5131) 2017-09-29 03:16:20 +02:00
extractor_spec.rb Spec Extractor (#3540) 2017-06-04 14:57:02 +02:00
feed_manager_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2018-10-05 15:23:57 +02:00
formatter_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
hash_object_spec.rb
language_detector_spec.rb Leave unknown language as nil if account is remote (#8861) 2018-10-05 19:17:46 +02:00
request_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
status_filter_spec.rb Fix regression from #3490 - filter out hidden statuses from ancestors/descendants even if the viewer is anonymous (#3752) 2017-06-15 02:00:08 +02:00
status_finder_spec.rb Add tests for embeds controller (#7719) 2018-06-04 10:35:56 +09:00
tag_manager_spec.rb Append '.test' to hostname in stub data (#7260) 2018-04-25 14:12:28 +02:00
user_settings_decorator_spec.rb Enable updating additional account information from user preferences via rest api (#6789) 2018-04-08 13:43:10 +02:00
webfinger_resource_spec.rb