Merge branch 'master' into master

Author: 霸都丶傲天

.github/main.workflow

@@ -1,6 +1,6 @@
 workflow "test" {
   resolves = ["CI Test Runner"]
-  on = "push"
+  on = "pull_request"
 }
 
 action "CI Test Runner" {

.rubocop.yml

@@ -1,3 +1,5 @@
+require: rubocop-performance
+
 AllCops:
   TargetRubyVersion: 2.4
   Exclude:

Gemfile

@@ -5,5 +5,6 @@ group :test do
   gem "minitest"
   gem "rake"
   gem "rubocop"
+  gem "rubocop-performance"
   gem "safe_yaml"
 end

Gemfile.lock

@@ -8,14 +8,12 @@ GEM
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
-    psych (3.1.0)
     rainbow (3.0.0)
     rake (12.3.2)
-    rubocop (0.67.2)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      psych (>= 3.1.0)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.6)

collections/clean-code-linters/index.md

@@ -5,12 +5,12 @@ items:
  - jshint/jshint
  - clutchski/coffeelint
  - csscomb/csscomb.js
- - brigade/scss-lint
+ - sds/scss-lint
  - htmlhint/HTMLHint
  - CSSLint/csslint
  - PyCQA/pycodestyle
  - PyCQA/flake8
- - ambv/black
+ - python/black
  - checkstyle/checkstyle
  - rubocop-hq/rubocop
  - oclint/oclint

test/topics_test_helper.rb

@@ -20,7 +20,7 @@
 
 def invalid_topic_message(topic)
   "'#{topic}' must be between 1-#{MAX_TOPIC_LENGTH} characters, start with a letter or number, " \
-    "and may include hyphens"
+    "include only lowercase letters, and may include hyphens"
 end
 
 def valid_topic?(raw_topic)

topics/game-jam/index.md

@@ -0,0 +1,9 @@
+---
+topic: game-jam
+aliases: gamejam
+display_name: Game Jam
+related: hackathon, ludum-dare, global-game-jam, game-off, js13k
+short_description: A game jam is a hackathon for creating video games.
+wikipedia_url: https://en.wikipedia.org/wiki/Game_jam
+---
+Game Jams challenge people to create games within a short period of time (usually over a weekend, a week, or a month), and with certain constraints like limited color palettes, file sizes, and themes.

topics/github/github.png

@@ -0,0 +1,13 @@
+---
+created_by: Chris Wanstrath, PJ Hyett, Tom Preston-Werner, and Scott Chacon
+display_name: GitHub
+github_url: https://github.com/github
+logo: github.png
+released: April 10, 2008
+short_description: You’re lookin’ at it.
+topic: github
+related: git
+url: https://github.com
+wikipedia_url: https://en.wikipedia.org/wiki/GitHub
+---
+GitHub makes it easier for developers to be developers: to work together, to solve challenging problems, to create the world’s most important technologies.

topics/github/index.md

@@ -0,0 +1,9 @@
+---
+topic: hackathon
+aliases: hackfest, codefest, hackday
+display_name: Hackathon
+related: game-jam, hacktoberfest, game-off
+short_description: A hackathon is a gathering where developers collaboratively code in an extreme manner over a short period of time.
+wikipedia_url: https://en.wikipedia.org/wiki/Hackathon
+---
+A hackathon is a sprint-like event in which people collaborate intensively on software projects. The goal of a hackathon is to create usable software or hardware with the goal of creating a functioning product by the end of the event.