Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap

mschaefers

2012-12-03 ba6ae959b8e21c714c69f66254e82837d45a3ed2

 src/com/gitblit/wicket/pages/RepositoryPage.java

@@ -115,7 +115,7 @@
            boolean canAccess = user.hasBranchPermission(repositoryName,

                        branch.reference.getName());

            if (!canAccess) {

               error(getString("gb.accessDeined"), true);

               error(getString("gb.accessDenied"), true);

            }

         }

      }

@@ -425,7 +425,7 @@
   }



   protected String getShortObjectId(String objectId) {

      return objectId.substring(0, 8);

      return objectId.substring(0, GitBlit.getInteger(Keys.web.shortCommitIdLength, 6));

   }



   protected void addRefs(Repository r, RevCommit c) {