Code

Fix conflict with Devise generator#23

Code

Closed

walterdavis wants to merge 2 commits intorails:masterrails/prototype-rails:masterfrom

walterdavis:masterwalterdavis/prototype-rails:masterCopy head branch name to clipboard

Commits

Commits on Feb 14, 2013

• added guard around TestCase

  walterdavis

  committed
  64b6c4f

  Copy full SHA for 64b6c4f

Commits on Feb 22, 2013

• revised test per Jeremy's suggestion

  walterdavis

  committed
  c75bd7e

  Copy full SHA for c75bd7e