diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-26 22:24:19 -0600 |
| commit | 7174d1c955116e142754189e6169d9b31b599070 (patch) | |
| tree | 49139e81fc3cff355950401207968dca0944acd0 /spec/fixtures | |
| parent | 7347bc733418651216f22f224caf656471499a08 (diff) | |
| parent | 65f30f65a2816d5b25c096be0f237bbca17608e5 (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
Diffstat (limited to 'spec/fixtures')
| -rw-r--r-- | spec/fixtures/requests/oembed_json_xml.html | 8 | ||||
| -rw-r--r-- | spec/fixtures/requests/oembed_xml.html | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/spec/fixtures/requests/oembed_json_xml.html b/spec/fixtures/requests/oembed_json_xml.html index b5fc9bed0..8afd8e997 100644 --- a/spec/fixtures/requests/oembed_json_xml.html +++ b/spec/fixtures/requests/oembed_json_xml.html @@ -1,8 +1,14 @@ <!DOCTYPE html> <html> <head> + <!-- + oEmbed + https://oembed.com/ + > The type attribute must contain either application/json+oembed for JSON + > responses, or text/xml+oembed for XML. + --> <link href='https://host/provider.json' rel='alternate' type='application/json+oembed'> - <link href='https://host/provider.xml' rel='alternate' type='application/xml+oembed'> + <link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'> </head> <body></body> </html> diff --git a/spec/fixtures/requests/oembed_xml.html b/spec/fixtures/requests/oembed_xml.html index 5d7633e71..bdfcca170 100644 --- a/spec/fixtures/requests/oembed_xml.html +++ b/spec/fixtures/requests/oembed_xml.html @@ -1,7 +1,13 @@ <!DOCTYPE html> <html> <head> - <link href='https://host/provider.xml' rel='alternate' type='application/xml+oembed'> + <!-- + oEmbed + https://oembed.com/ + > The type attribute must contain either application/json+oembed for JSON + > responses, or text/xml+oembed for XML. + --> + <link href='https://host/provider.xml' rel='alternate' type='text/xml+oembed'> </head> <body></body> </html> |