Merged #177 "Disable permission checkboxes if permission is inherited"

James Moger

2014-09-11 1a44e0afdbcf3b45347c248b0b1decd5853bf69c

 src/main/java/com/gitblit/servlet/FederationServlet.java

@@ -164,7 +164,7 @@


         // setup the last and netx pull dates

         results.lastPull = new Date();

         int mins = TimeUtils.convertFrequencyToMinutes(results.frequency);

         int mins = TimeUtils.convertFrequencyToMinutes(results.frequency, 5);

         results.nextPull = new Date(System.currentTimeMillis() + (mins * 60 * 1000L));



         // acknowledge the receipt of status