]> source.dussan.org Git - gitblit.git/commit
projects / gitblit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb25261) | patch
Add merge type setting to repository page. ticket/104 218/head 04/104/1
authorFlorian Zschocke <florian.zschocke@cycos.com>
Mon, 23 Jun 2014 02:12:19 +0000 (04:12 +0200)
committerFlorian Zschocke <florian.zschocke@cycos.com>
Sun, 7 Sep 2014 20:40:18 +0000 (22:40 +0200)
commit90fc5ac5dbe6d5093525ab55c8d81c8277121550
tree5020447fe3cf11bac93e40c50e55dadf31fec8f1tree | snapshot
parenteb252616d18811e611fe10f048fb9b04460df671commit | diff
Add merge type setting to repository page.

The merge type is a per repository setting. Add it to the edit page.
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties diff | blob | history
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.html diff | blob | history
src/main/java/com/gitblit/wicket/pages/EditRepositoryPage.java diff | blob | history
Pure java git solution: https://github.com/gitblit-org/gitblit