Merge branch 'ticket/70' into develop

James Moger

2014-05-12 e832a7d1a077a067755b7f8d4996d57b95e85eea

 src/main/java/com/gitblit/auth/HtpasswdAuthProvider.java

@@ -35,8 +35,6 @@
import com.gitblit.Keys;
import com.gitblit.auth.AuthenticationProvider.UsernamePasswordAuthenticationProvider;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;


/**
@@ -186,9 +184,7 @@
                }

                // create a user cookie
                if (StringUtils.isEmpty(user.cookie) && !ArrayUtils.isEmpty(password)) {
                    user.cookie = StringUtils.getSHA1(user.username + passwd);
                }
                setCookie(user, password);

                // Set user attributes, hide password from backing user service.
                user.password = Constants.EXTERNAL_ACCOUNT;