Merge remote-tracking branch 'upstream/pull/1986'
authorTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 18:01:28 +0000 (19:01 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 10 Sep 2018 18:01:28 +0000 (19:01 +0100)
1  2 
test/controllers/user_controller_test.rb