Skip to content

Commit 0852217

Browse files
authored
Merge branch 'master' into vb
2 parents 64e700a + 46e38bc commit 0852217

File tree

8 files changed

+24
-8
lines changed

8 files changed

+24
-8
lines changed

.rubocop.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ Metrics/LineLength:
1616
Max: 100
1717
IgnoredPatterns: ['\A\s*#']
1818

19+
Naming/RescuedExceptionsVariableName:
20+
PreferredName: "error"
21+
1922
Style/FrozenStringLiteralComment:
2023
Enabled: false
2124

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ GEM
66
jaro_winkler (1.5.2)
77
minitest (5.11.3)
88
parallel (1.17.0)
9-
parser (2.6.2.0)
9+
parser (2.6.2.1)
1010
ast (~> 2.4.0)
1111
psych (3.1.0)
1212
rainbow (3.0.0)
1313
rake (12.3.2)
14-
rubocop (0.66.0)
14+
rubocop (0.67.2)
1515
jaro_winkler (~> 1.5.1)
1616
parallel (~> 1.10)
1717
parser (>= 2.5, != 2.5.1.1)

test/test_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ def metadata_for(dir, name)
2929

3030
begin
3131
YAML.safe_load(parts[1])
32-
rescue Psych::SyntaxError => ex
33-
flunk "invalid YAML: #{ex.message}"
32+
rescue Psych::SyntaxError => error
33+
flunk "invalid YAML: #{error.message}"
3434
end
3535
end
3636

topics/dotnet/dotnet.png

-7.17 KB
Loading

topics/dotnet/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ display_name: ".NET"
55
github_url: https://github.com/dotnet
66
logo: dotnet.png
77
released: February 13, 2002
8-
short_description: ".NET is a software framework developed by Microsoft."
8+
short_description: ".NET is a free, cross-platform, open source developer platform."
99
topic: dotnet
10-
url: https://www.microsoft.com/net/
10+
url: https://dotnet.microsoft.com
1111
wikipedia_url: https://en.wikipedia.org/wiki/.NET_Framework
1212
---
13-
.NET is a software framework developed by Microsoft in February of 2002 as an infrastructure for building and running applications and services. The purpose of .NET is to make it easier for users to share information between websites. The framework is intended to be utilized for Windows platforms.
13+
.NET is a free, cross-platform, open source developer platform for building many different types of applications.

topics/flutter/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ logo: flutter.png
66
related: dart, flutter-plugin, flutter-apps
77
released: May 2017
88
short_description: Flutter is an open source mobile application development SDK created by Google.
9-
url: https://flutter.io/
9+
url: https://flutter.dev/
1010
wikipedia_url: https://en.wikipedia.org/wiki/Flutter_(software)
1111
---
1212
Flutter is an open source mobile application development SDK created by Google. It is used to develop applications for Android and iOS, as well as being the primary method of creating applications for Google Fuchsia.

topics/nashville/index.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
created_by: "James Robertson, John Donelson, and a party of Overmountain Men"
3+
display_name: "Nashville, Tennessee"
4+
github_url: https://github.com/code-for-nashville
5+
logo: nashville.png
6+
related: tennessee, nashvillesoftwareschool, east-nashville, open-data, civic-tech
7+
released: 1779
8+
short_description: Nashville is the capital and most populous city of the U.S. state of Tennessee.
9+
topic: nashville
10+
url: https://www.visitmusiccity.com/
11+
wikipedia_url: https://en.wikipedia.org/wiki/Nashville,_Tennessee
12+
---
13+
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.

topics/nashville/nashville.png

31.3 KB
Loading

0 commit comments

Comments
 (0)