Merge pull request #296 from Enrico204/develop

James Moger

2015-08-10 51aa4f20fcf39a225e91aaa5da350d1f9fda6424

 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;