Merge branch 'ticket/100' into release-v1.6.0

James Moger

2014-06-12 ef4a461f2fca3f445afb16718448b14f2b57e810

 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));