Merge branch 'settings' into build

joshlarsen · joshlarsen · commit b8d349430e97 · 2021-02-14T12:25:18.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@ docker/log
 .viminfo
 .bash_history
 *.swp
+.env
+.idea
 
 # Ruby / RMV
 .ruby-version
diff --git a/docker/.rubocop.yml b/docker/.rubocop.yml
@@ -9,7 +9,7 @@
 #
 # See https://docs.rubocop.org/rubocop/configuration
 Layout/LineLength:
-  Max: 100
+  Max: 120
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always_true
   Safe: true

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`# See https://docs.rubocop.org/rubocop/configuration`
`11`	`11`	`Layout/LineLength:`
`12`		`- Max: 100`
	`12`	`+ Max: 120`
`13`	`13`	`Style/FrozenStringLiteralComment:`
`14`	`14`	`EnforcedStyle: always_true`
`15`	`15`	`Safe: true`