Merge branch 'ticket/210' into develop

James Moger

2014-10-22 f9405bfa30bab4223491898b8ba71dbb4b42c414

 src/main/java/com/gitblit/client/GitblitClient.java

@@ -253,9 +253,11 @@


      // create list of available scripts by excluding inherited scripts

      List<String> scripts = new ArrayList<String>();

      for (String script : settings.pushScripts) {

         if (!inherited.contains(script)) {

            scripts.add(script);

      if (!ArrayUtils.isEmpty(settings.pushScripts)) {

         for (String script : settings.pushScripts) {

            if (!inherited.contains(script)) {

               scripts.add(script);

            }

         }

      }

      return scripts;