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)
commit276599d34fcbd7babc8e34b6859459cb44acabe7
treea1987c3754f34427ed43abab975e697b4898178d
parent0e0c89b95c16abd7bc548bea7bff03cbb715b3b3
parent100babbe6cd463198f03f6b409cca2f5de45b4ea
Merge remote-tracking branch 'upstream/pull/1986'
test/controllers/user_controller_test.rb