This looks like its on the right track, however it is hard to check and test it since the commits include some old merges and conflict resolutions. Would you mind resetting or rebasing your master branch to match the latest from Allura? Then make a new commit with just the necessary changes. That would be best. Thanks.
Also, as far as the actual changes go, in the test_vote method, you can removing the few lines for "enable voting" since it will be already enabled now.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
This looks like its on the right track, however it is hard to check and test it since the commits include some old merges and conflict resolutions. Would you mind resetting or rebasing your master branch to match the latest from Allura? Then make a new commit with just the necessary changes. That would be best. Thanks.
Also, as far as the actual changes go, in the
test_vote
method, you can removing the few lines for "enable voting" since it will be already enabled now.From which repo and branch do I have to rebase? The dev or the master?
Rebase on master. We don't use dev anymore.
I don't want this merge to be completed anymore. I would work in the way as explained by heiths now. So this can be rejected.
Sounds good, I'll close this one out then.