fix mysql test error because of PR merges

hovel / pybbm

Django forum solution. Tested, documented, shipped with example project.

BSD 2-Clause "Simplified" License

225 stars 151 forks source link

fix mysql test error because of PR merges #261

Closed DylannCordel closed 7 years ago

DylannCordel commented 7 years ago

There was a merged PR (#197) with some read-tracking modifications which needed a little adjustment to work with another merged PR (#258)

This PR fixes this conflict.

DylannCordel commented 7 years ago

@lampslave could you merge this one quickly to avoid travis's invalid failures for newer PR please ? Thanks for recent merges. When you have multiple PR from @skolsuper and me to merge, I can merge all of those into a single PR if you want. It will be simpler to you to merge all the stuff without having to find and fix conflicts / required adjustments if you have not time for that at this moment.

I know it's time-consuming to keep an open-source project, so if I can help you spend less time with my own PR, it's okay ! :)

coveralls commented 7 years ago

Coverage increased (+0.02%) to 93.244% when pulling 5f9bfa1f5b06d7acab33b612a2890b18fac76707 on webu:fix/mysql-tests into feb5ee48e0abe7a6b6d62bbd22fdc9c170579e66 on hovel:master.

coveralls commented 7 years ago

Coverage increased (+0.02%) to 93.244% when pulling 5f9bfa1f5b06d7acab33b612a2890b18fac76707 on webu:fix/mysql-tests into feb5ee48e0abe7a6b6d62bbd22fdc9c170579e66 on hovel:master.

coveralls commented 7 years ago

Coverage increased (+0.02%) to 93.244% when pulling 5f9bfa1f5b06d7acab33b612a2890b18fac76707 on webu:fix/mysql-tests into feb5ee48e0abe7a6b6d62bbd22fdc9c170579e66 on hovel:master.

lampslave commented 7 years ago

I wanted to ask you to check code after last merges, but you did it first :)

I can merge all of those into a single PR if you want

It will be great, but only for checked and acceped (in comments) PRs.

DylannCordel commented 7 years ago

It will be great, but only for checked and acceped (in comments) PRs.

@lampslave yes of course. You just have to "cite" me in one of concerned/accepted PR and list all other concerned/accepted PR I'll have to merge into a unique PR.

Thanks for your quick merge :)