Merge pull request #1149 from girder/yaml-mimetypes

Add another mime type to those considered to be yaml
girder · May 4, 2023 · 10e1f72 · 10e1f72
2 parents 0fd8877 + 25f48d0
commit 10e1f72
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,10 @@
 ## 1.20.6
 
 ### Improvements
-- Store current frame and style in the DOM for easier access ([#1036](../../pull/1036))
-- Convert long girder GET and PUT requests to POSTs ([#1037](../../pull/1037))
+- Store current frame and style in the DOM for easier access ([#1136](../../pull/1136))
+- Convert long girder GET and PUT requests to POSTs ([#1137](../../pull/1137))
 - Propagate more feature events from geojs on annotations ([#1147](../../pull/1147))
+- Add another mime type to those considered to be yaml ([#1149](../../pull/1149))
 
 ### Changes
 - Add a guard if PIL doesn't support ImageCms ([#1132](../../pull/1132))

diff --git a/girder/girder_large_image/web_client/views/itemViewCodemirror.js b/girder/girder_large_image/web_client/views/itemViewCodemirror.js
@@ -155,6 +155,7 @@ const Formats = {
 };
 Formats['application/vnd.geo+json'] = Formats['application/json'];
 Formats['text/x-yaml'] = Formats['text/yaml'];
+Formats['application/x-yaml'] = Formats['text/yaml'];
 
 function lintGirderIni(text, callback) {
     return restRequest({