Merge branch 'add_support_for_erb_types'

enova · Jun 17, 2019 · e2186aa · e2186aa
2 parents c6ca75a + dadf436
commit e2186aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,7 +43,7 @@ notifications:
   slack: enova:xzPNLg3AxkbkUcUlfn7sqHW5
   email: trogdor@enova.com
 
-addons:
-  postgresql: "9.3"
+services:
+  - postgresql
 
 secure: "SovzxN4N1XrP1I3jtTQrwSJUI0XZCotr7NkjPTlnk3Zb1/qa/QKpoM3bM64/YFgL33I8BIp2UDAVQj4CnbqqetbG8MfcjNOEmBLF7gHRFMD4NHpFwS9LEwwSdWCnSNXdB0G7gySd5X/dLgQ1fKEaFaacvRhfFTeAr671g5et5RY="
diff --git a/lib/landable/configuration.rb b/lib/landable/configuration.rb
@@ -196,7 +196,7 @@ def initialize
     private
 
     DOTFILE_MATCHER_REGEXP = /^\.[[[:alnum:]]\.]*$/
-    EXPECTED_FILETYPES = ['yml', 'yaml', 'json']
+    EXPECTED_FILETYPES = ['yml', 'yaml', 'json', 'yml.erb', 'yaml.erb']
     EXPECTED_FILETYPES_REGEXP = /\.(#{ EXPECTED_FILETYPES.join('|') })\z/
 
     def config_keys(base_path)