Merge branch 'ticket/166' into develop

James Moger

2014-09-05 cf9f80f5d576fa27bd34cc8f880d9eb5c4c619c8

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

@@ -153,15 +153,16 @@
        if (!url.endsWith("/")) {
           url = url.concat("/");
        }
        String apiUrl = url + "users/current.json";
        
        HttpURLConnection http;
        if (username == null) {
           // apikey authentication
           String apiKey = String.valueOf(password);
           String apiUrl = url + "users/current.json?key=" + apiKey;
           http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, null, null);
            http.addRequestProperty("X-Redmine-API-Key", apiKey);
        } else {
           // username/password BASIC authentication
           String apiUrl = url + "users/current.json";
           http = (HttpURLConnection) ConnectionUtils.openConnection(apiUrl, username, password);
        }
        http.setRequestMethod("GET");