Merge remote-tracking branch 'upstream/pull/1892'

author Tom Hughes <tom@compton.nu>

Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)

committer Tom Hughes <tom@compton.nu>

Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
author Tom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
committer Tom Hughes <tom@compton.nu>
Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
diff --cc .rubocop_todo.yml

index 83f60d4f8162bc95ce0eebd9a05578ddfbdef21a,2f6ea0087252f4da718d6035100c28cc8d7c0ed9..362cfcb3235123751c8018c9fb69250bff842c42
--- 1/.rubocop_todo.yml
--- 2/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@@ -67,7 -67,7 +67,7 @@@ Metrics/AbcSize
   # Offense count: 41
   # Configuration parameters: CountComments, ExcludedMethods.
   Metrics/BlockLength:
-   Max: 245
- -  Max: 241
++  Max: 247
   
   # Offense count: 12
   # Configuration parameters: CountBlocks.
diff --cc config/routes.rb
Simple merge
author	Tom Hughes <tom@compton.nu>
	Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
committer	Tom Hughes <tom@compton.nu>
	Wed, 6 Jun 2018 13:51:30 +0000 (14:51 +0100)
		1	2
.rubocop_todo.yml	patch \|	diff1 \|	diff2 \|	blob \| history
config/routes.rb	patch \|	diff1 \|	diff2 \|	blob \| history