diff options
author | mschaefers <mschaefers@scoop-gmbh.de> | 2012-12-03 09:49:23 +0100 |
---|---|---|
committer | mschaefers <mschaefers@scoop-gmbh.de> | 2012-12-03 09:49:23 +0100 |
commit | ba6ae959b8e21c714c69f66254e82837d45a3ed2 (patch) | |
tree | 3f538ad138d47b43d8f6a00e0f3c18c147bfcb90 /src/com/gitblit/wicket/pages/RepositoryPage.java | |
parent | e2013b91626a4c693053e9859add68ff371f2298 (diff) | |
parent | f1c3a882d12aede461e3c8ca3ebd298bdb28bc5d (diff) | |
download | gitblit-ba6ae959b8e21c714c69f66254e82837d45a3ed2.tar.gz gitblit-ba6ae959b8e21c714c69f66254e82837d45a3ed2.zip |
Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap
Conflicts:
distrib/gitblit.properties
Diffstat (limited to 'src/com/gitblit/wicket/pages/RepositoryPage.java')
-rw-r--r-- | src/com/gitblit/wicket/pages/RepositoryPage.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index c90e3530..346edc3e 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -115,7 +115,7 @@ public abstract class RepositoryPage extends BasePage { boolean canAccess = user.hasBranchPermission(repositoryName,
branch.reference.getName());
if (!canAccess) {
- error(getString("gb.accessDeined"), true);
+ error(getString("gb.accessDenied"), true);
}
}
}
|