From a5bfd36168414fd3cc1846d75e612ed2dc7edf73 Mon Sep 17 00:00:00 2001
From: Vikas Potluri <vikaspotluri123.github@gmail.com>
Date: Wed, 3 Apr 2019 13:54:05 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20confusing=20messaging=20?=
 =?UTF-8?q?around=20.yml=20extension=20being=20allowed=20for=20routes.yaml?=
 =?UTF-8?q?=20uploads=20(#1140)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

no issue

The server never supported uploading .yml files

* updated uploader `invalid extension` error message to be more abstract
* fixed routes uploader validation allowing .yml files
---
 app/components/gh-uploader.js    | 2 +-
 app/controllers/settings/labs.js | 2 +-
 app/templates/settings/labs.hbs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/components/gh-uploader.js b/app/components/gh-uploader.js
index 6b802b7a29..54efcf3465 100644
--- a/app/components/gh-uploader.js
+++ b/app/components/gh-uploader.js
@@ -181,7 +181,7 @@ export default Component.extend({
 
         if (!extension || extensions.indexOf(extension.toLowerCase()) === -1) {
             let validExtensions = `.${extensions.join(', .').toUpperCase()}`;
-            return `The image type you uploaded is not supported. Please use ${validExtensions}`;
+            return `The file type you uploaded is not supported. Please use ${validExtensions}`;
         }
 
         return true;
diff --git a/app/controllers/settings/labs.js b/app/controllers/settings/labs.js
index 3885a79ff7..15cd507bc3 100644
--- a/app/controllers/settings/labs.js
+++ b/app/controllers/settings/labs.js
@@ -26,7 +26,7 @@ const IMPORT_MIME_TYPES = [
 const JSON_EXTENSION = ['json'];
 const JSON_MIME_TYPE = ['application/json'];
 
-const YAML_EXTENSION = ['yml', 'yaml'];
+const YAML_EXTENSION = ['yaml'];
 const YAML_MIME_TYPE = [
     'text/vnd.yaml',
     'application/vnd.yaml',
diff --git a/app/templates/settings/labs.hbs b/app/templates/settings/labs.hbs
index cb436f87b3..123bec1052 100644
--- a/app/templates/settings/labs.hbs
+++ b/app/templates/settings/labs.hbs
@@ -307,7 +307,7 @@
                             {{/if}}
                         </span>
                     </button>
-                    <span><a href="#" {{action "downloadFile" "settings/routes/yaml"}} data-test-link="download-routes">Download current routes.yml</a></span>
+                    <span><a href="#" {{action "downloadFile" "settings/routes/yaml"}} data-test-link="download-routes">Download current routes.yaml</a></span>
                 {{/if}}
 
                 <div style="display:none">