Merge branch 'master' into patch-1

Author: kenyonj

.rubocop.yml

@@ -16,6 +16,9 @@ Metrics/LineLength:
   Max: 100
   IgnoredPatterns: ['\A\s*#']
 
+Naming/RescuedExceptionsVariableName:
+  PreferredName: "error"
+
 Style/FrozenStringLiteralComment:
   Enabled: false
 

Gemfile.lock

@@ -6,12 +6,12 @@ GEM
     jaro_winkler (1.5.2)
     minitest (5.11.3)
     parallel (1.17.0)
-    parser (2.6.2.0)
+    parser (2.6.2.1)
       ast (~> 2.4.0)
     psych (3.1.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.66.0)
+    rubocop (0.67.2)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)

test/test_helper.rb

@@ -29,8 +29,8 @@ def metadata_for(dir, name)
 
   begin
     YAML.safe_load(parts[1])
-  rescue Psych::SyntaxError => ex
-    flunk "invalid YAML: #{ex.message}"
+  rescue Psych::SyntaxError => error
+    flunk "invalid YAML: #{error.message}"
   end
 end
 

topics/nashville/index.md

@@ -0,0 +1,13 @@
+---
+created_by: "James Robertson, John Donelson, and a party of Overmountain Men"
+display_name: "Nashville, Tennessee"
+github_url: https://github.com/code-for-nashville
+logo: nashville.png
+related: tennessee, nashvillesoftwareschool, east-nashville, open-data, civic-tech
+released: 1779
+short_description: Nashville is the capital and most populous city of the U.S. state of Tennessee.
+topic: nashville
+url: https://www.visitmusiccity.com/
+wikipedia_url: https://en.wikipedia.org/wiki/Nashville,_Tennessee
+---
+Nashville is the capital and most populous city of the U.S. state of Tennessee, called the "home of country music." It is a center for the music, healthcare, publishing, private prison, banking, and transportation industries, and is home to numerous colleges and universities. In March 2012, a Gallup poll ranked Nashville in the top five regions for job growth. Nashville lies on the Cumberland River.