@@ -114,16 +114,16 @@ trait PagesControllerBase extends ControllerBase {
114
114
115
115
def resolveBranch (git : Git , name : String ) = Option (git.getRepository.resolve(name))
116
116
117
- def shouldRedirect (path : String , path0 : String ) =
117
+ def shouldRedirect (path : String , path0 : String ): Boolean =
118
118
! isRoot(path) && path0 != path && path0.startsWith(path) && ! path.endsWith(" /" )
119
119
120
- def getPathIndexObjectId (git : Git , path : String , revCommit : RevCommit ) = {
120
+ def getPathIndexObjectId (git : Git , path : String , revCommit : RevCommit ): Option [( String , ObjectId )] = {
121
121
getPathObjectId0(git, path, revCommit)
122
122
.orElse(getPathObjectId0(git, appendPath(path, " index.html" ), revCommit))
123
123
.orElse(getPathObjectId0(git, appendPath(path, " index.htm" ), revCommit))
124
124
}
125
125
126
- def getPathObjectId0 (git : Git , path : String , revCommit : RevCommit ) = {
126
+ def getPathObjectId0 (git : Git , path : String , revCommit : RevCommit ): Option [( String , ObjectId )] = {
127
127
getPathObjectId(git, path, revCommit).map(path -> _)
128
128
}
129
129
@@ -133,7 +133,7 @@ trait PagesControllerBase extends ControllerBase {
133
133
else base + " /" + suffix
134
134
}
135
135
136
- def isRoot (path : String ) = path == " "
136
+ def isRoot (path : String ): Boolean = path == " "
137
137
138
138
private def pagesOption : Constraint = new Constraint () {
139
139
override def validate (name : String , value : String , messages : Messages ): Option [String ] =
0 commit comments