Merge branch 'ticket/83' into develop

James Moger

2014-05-22 93b795c6e4aa28960cbe9ae5c3b1a2da1f2083d7

 src/main/java/com/gitblit/wicket/pages/EditUserPage.java

@@ -243,6 +243,8 @@
      form.add(new CheckBox("canFork").setEnabled(app().settings().getBoolean(Keys.web.allowForking, true)));

      form.add(new CheckBox("canCreate"));

      form.add(new CheckBox("excludeFromFederation"));

      form.add(new CheckBox("disabled"));



      form.add(new RegistrantPermissionsPanel("repositories",   RegistrantType.REPOSITORY, repos, permissions, getAccessPermissions()));

      form.add(teams.setEnabled(editTeams));