Merged #245 "Strip line breaks from pasted SSH keys"

James Moger

2015-03-07 c9afc9ed01dbc6b74ecb2734d2cd7ed943b5d643

 src/main/java/com/gitblit/utils/JsonUtils.java

@@ -274,10 +274,10 @@
      return builder.create();

   }



   private static class GmtDateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {

   public static class GmtDateTypeAdapter implements JsonSerializer<Date>, JsonDeserializer<Date> {

      private final DateFormat dateFormat;



      private GmtDateTypeAdapter() {

      public GmtDateTypeAdapter() {

         dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);

         dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));

      }