Merge branch 'ticket/245' into develop

James Moger

2015-03-07 d40a44c8c8df8f6bd81c93e72314224f85656f18

Merge branch 'ticket/245' into develop

 src/main/java/com/gitblit/transport/ssh/SshKey.java

@@ -27,6 +27,7 @@

import com.gitblit.Constants.AccessPermission;
import com.gitblit.utils.StringUtils;
import com.google.common.base.Joiner;

/**
 * Class that encapsulates a public SSH key and it's metadata.
@@ -51,7 +52,8 @@
    private AccessPermission permission;

    public SshKey(String data) {
        this.rawData = data;
        // strip out line breaks (issue-571)
        this.rawData = Joiner.on("").join(data.replace("\r\n", "\n").split("\n"));
        this.permission = AccessPermission.PUSH;
    }