To stay consistent throughout the codebase, we indent with 4 spaces instead of tabs. You should be able to setup your editor for that. Mixed tabs and spaces can cause issues.
It would be nice to toss in a quick assertion -- maybe somewhere around allura/tests/functional/test_auth.py:737
When submitting a merge request, try to limit the commits to only the ones relevant to what you want merged :)
Other than that -- your fix seems to work well.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Hey Pranav -- nice work man :)
A few quick notes:
allura/tests/functional/test_auth.py:737
Other than that -- your fix seems to work well.
Here is a quick outline of how Dave and I typically work:
Create a new branch from master:
git checkout -b ps/8018
ps being your initials and 8018 the ticket number you're working on.
Make all the changes for that ticket and commit/push them to your fork.
git add allura/controllers/auth.py
git commit -m '[#8018] Make first confirmed email become the primary'
git push
Then when you submit for a merge request, you'd select: From
ps/8018
To:master
.You don't have to do it the same way -- but it might help keep your fork organized.
Thanks Heith. Reject this requet. I will start in the way you explained from the beginning.