Merge branch 'master' into patch-1

kenyonj · web-flow · commit 45a4df110c01 · 2019-05-06T11:48:41.000-04:00
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1,3 +1,5 @@
+require: rubocop-performance
+
 AllCops:
   TargetRubyVersion: 2.4
   Exclude:
diff --git a/Gemfile b/Gemfile
@@ -5,5 +5,6 @@ group :test do
   gem "minitest"
   gem "rake"
   gem "rubocop"
+  gem "rubocop-performance"
   gem "safe_yaml"
 end
diff --git a/test/topics_test_helper.rb b/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)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+require: rubocop-performance`
	`2`	`+`
`1`	`3`	`AllCops:`
`2`	`4`	`TargetRubyVersion: 2.4`
`3`	`5`	`Exclude:`