Skip to content

Commit 1191510

Browse files
authored
Merge branch 'master' into robotics
2 parents 5166221 + c7c015d commit 1191510

File tree

11 files changed

+35
-7
lines changed

11 files changed

+35
-7
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-todo.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ Information included in this repository will appear on each topic's respective p
3838
- [ ] [gui](https://github.com/topics/gui/)
3939
- [ ] [image](https://github.com/topics/image/)
4040
- [ ] [iot](https://github.com/topics/iot/)
41-
- [ ] [javafx](https://github.com/topics/javafx/)
4241
- [ ] [keras](https://github.com/topics/keras/)
4342
- [ ] [logging](https://github.com/topics/logging/)
4443
- [ ] [microservice](https://github.com/topics/microservice/)
@@ -80,6 +79,7 @@ Information included in this repository will appear on each topic's respective p
8079
- [x] [dot-net](https://github.com/topics/dot-net/)
8180
- [x] [ethereum](https://github.com/topics/ethereum/)
8281
- [x] [image-processing](https://github.com/topics/image-processing/)
82+
- [x] [javafx](https://github.com/topics/javafx/)
8383
- [x] [lua](https://github.com/topics/lua/)
8484
- [x] [maven](https://github.com/topics/maven/)
8585
- [x] [neural-network](https://github.com/topics/neural-network/)

topics/gin/gin.png

-1.89 KB
Loading

topics/javafx/index.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
aliases: javafx-application, javafx-desktop-apps, javafx-gui, javafx-library
3+
created_by: Oracle
4+
display_name: JavaFX
5+
logo: javafx.png
6+
related: java, swing
7+
released: December 4, 2008
8+
short_description: JavaFX is a Java library used to create graphical user interfaces.
9+
topic: javafx
10+
wikipedia_url: https://en.wikipedia.org/wiki/JavaFX
11+
---
12+
JavaFX is a Java library used to build consistent graphical user interfaces across a wide range of platforms. Applications developed with JavaFX can be run on devices such as desktop computers, mobile phones, TVs, tablets, and more.

topics/javafx/javafx.png

23 KB
Loading

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

topics/visual-basic/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ related: language, dotnet
88
released: May 1991
99
short_description: Visual Basic is an object-oriented and type-safe programming language.
1010
topic: visual-basic
11-
url: https://docs.microsoft.com/en-us/dotnet/visual-basic/
11+
url: https://docs.microsoft.com/dotnet/visual-basic/
1212
wikipedia_url: https://en.wikipedia.org/wiki/Visual_Basic_.NET
1313
---
1414
Visual Basic is an approachable language with a simple syntax for building type-safe, object-oriented apps.

0 commit comments

Comments
 (0)