Merged #30 "Watch list push parameters are not always honored"

James Moger

2014-03-12 ed882589e15422e03267ffb9ca6cb1a7376d1822

 src/main/java/com/gitblit/models/TicketModel.java

@@ -785,7 +785,21 @@
         for (String item : items) {
            list.add(prefix + item);
         }
         if (hasField(field)) {
            String flat = getString(field);
            if (isEmpty(flat)) {
               // field is empty, use this list
         setField(field, join(list, ","));
            } else {
               // merge this list into the existing field list
               Set<String> set = new TreeSet<String>(Arrays.asList(flat.split(",")));
               set.addAll(list);
               setField(field, join(set, ","));
            }
         } else {
            // does not have a list for this field
            setField(field, join(list, ","));
         }
      }

      public String getId() {