Merge "If a user logs in while not on https, then the user should be sent back to...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Dec 2014 22:36:23 +0000 (22:36 +0000)
commit30e009794bacc2e3138c372e6ddf876dca2d4a9c
tree47bfa34d9e4d371c23aeb89e85a6fc63bac45944
parentd5fa9486481e26f984fb092e30983a0018f4bce4
parent7ddada5c0c7518e941d57de07313a19b00eb6ee1
Merge "If a user logs in while not on https, then the user should be sent back to the non-secure website."
includes/specials/SpecialUserlogin.php
includes/templates/Userlogin.php