Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-13 00:45:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fork-and-pullreq

Browse Source 
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
	src/main/scala/service/RepositoryService.scala
This commit is contained in:
takezoe
2013-08-04 05:10:01 +09:00
parent 7a8958741d 42faf9bda2
commit e52aa7ad3c
20 changed files with 792 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/twirl/settings/options.scala.html
View File

@@ -13,8 +13,7 @@
<label for="description"><strong>Description</strong></label>
<input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
</fieldset>
<hr>
<fieldset>
<fieldset class="margin">
<label for="defaultBranch"><strong>Default Branch</strong></label>
<select name="defaultBranch" id="defaultBranch">
@repository.branchList.map { branch =>
@@ -22,7 +21,6 @@
}
</select>
</fieldset>
<hr>
<fieldset class="margin">
<label>
<input type="radio" name="isPrivate" value="false"