Merge branch 'master' into add-features-to-ldapauth
|
---|
src/main/resources/update/1_12.sql 0 → 100644 |
---|
src/main/scala/ScalatraBootstrap.scala |
---|
src/main/scala/app/AccountController.scala |
---|
src/main/scala/app/CreateRepositoryController.scala 100644 → 0 |
---|
src/main/scala/app/PullRequestsController.scala |
---|
src/main/scala/app/RepositoryViewerController.scala |
---|
src/main/scala/app/UserManagementController.scala |
---|
src/main/scala/model/GroupMembers.scala |
---|
src/main/scala/service/AccountService.scala |
---|
src/main/scala/service/RepositorySearchService.scala |
---|
src/main/scala/service/RepositoryService.scala |
---|
src/main/scala/service/WikiService.scala |
---|
src/main/scala/servlet/AutoUpdateListener.scala |
---|
src/main/scala/servlet/GitRepositoryServlet.scala |
---|
src/main/scala/util/Authenticator.scala |
---|
src/main/scala/util/JGitUtil.scala |
---|
src/main/twirl/account/group.scala.html 0 → 100644 |
---|
src/main/twirl/account/main.scala.html |
---|
src/main/twirl/account/members.scala.html |
---|
src/main/twirl/account/newrepo.scala.html 0 → 100644 |
---|
src/main/twirl/account/repositories.scala.html |
---|
src/main/twirl/admin/users/group.scala.html |
---|
src/main/twirl/header.scala.html |
---|
src/main/twirl/main.scala.html |
---|
src/main/twirl/newrepo.scala.html 100644 → 0 |
---|
src/main/twirl/repo/branches.scala.html |
---|
src/main/twirl/repo/files.scala.html |
---|
src/main/twirl/settings/collaborators.scala.html |
---|
src/main/webapp/assets/common/images/folder_link.png 0 → 100644 |
---|
|
src/test/scala/service/AccountServiceServiceSpec.scala 100644 → 0 |
---|
src/test/scala/service/AccountServiceSpec.scala 0 → 100644 |
---|