summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/manager/GitblitManager.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-09-05 19:20:08 -0400
committerJames Moger <james.moger@gitblit.com>2014-09-05 19:20:08 -0400
commitb8a44784ba8b0aaf9a3fbe6321956c0ee0e0451c (patch)
tree9b0925e66f1cfc915dd0a027f33edd09f109bec9 /src/main/java/com/gitblit/manager/GitblitManager.java
parentcf9f80f5d576fa27bd34cc8f880d9eb5c4c619c8 (diff)
parenta08e6f95864eb9a7ea8a1003083938f8bbc648c7 (diff)
downloadgitblit-b8a44784ba8b0aaf9a3fbe6321956c0ee0e0451c.tar.gz
gitblit-b8a44784ba8b0aaf9a3fbe6321956c0ee0e0451c.zip
Merge branch 'ticket/167' into develop
Diffstat (limited to 'src/main/java/com/gitblit/manager/GitblitManager.java')
-rw-r--r--src/main/java/com/gitblit/manager/GitblitManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 02b2d675..da081276 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -223,6 +223,13 @@ public class GitblitManager implements IGitblit {
RepositoryModel cloneModel = repository.cloneAs(cloneName);
// owner has REWIND/RW+ permissions
cloneModel.addOwner(user.username);
+
+ // ensure initial access restriction of the fork
+ // is not lower than the source repository (issue-495/ticket-167)
+ if (repository.accessRestriction.exceeds(cloneModel.accessRestriction)) {
+ cloneModel.accessRestriction = repository.accessRestriction;
+ }
+
repositoryManager.updateRepositoryModel(cloneName, cloneModel, false);
// add the owner of the source repository to the clone's access list