nazoking
5fd87ca764
add jrebel document
2016-01-03 22:46:15 +09:00
nazoking
1042c50cc3
add jrebel plugin
2016-01-03 22:09:52 +09:00
moccos
adff36c44b
Use repository.repository.defaultBranch instead of "master"
2016-01-03 20:02:27 +09:00
moccos
e8f6d2b990
Add path and branch name to the page title
2016-01-03 05:00:02 +09:00
Naoki Takezoe
a3b3262ad5
Merge pull request #1026 from team-lab/fix/test-merge-service-more-likely-to-succeed
...
MergeServiceSpec more likely to succeed
2016-01-03 00:43:45 +09:00
Naoki Takezoe
9efba82e94
Merge pull request #1024 from team-lab/fix/test-specs2-junit
...
fix test ( add specs2-junit )
2016-01-02 23:41:51 +09:00
nazoking
781d465f8d
MergeServiceSpec more likely to succeed
2016-01-02 20:58:44 +09:00
nazoking
766867f341
add test
2016-01-02 20:41:23 +09:00
nazoking
e237a44f56
move MergeStatus to service
2016-01-02 20:23:07 +09:00
nazoking
249430449b
use common mapper
2016-01-02 20:23:07 +09:00
nazoking
73d935efe3
fix typo
2016-01-02 20:23:07 +09:00
nazoking
79251ef1d1
updete bootstrap 3
2016-01-02 20:23:07 +09:00
nazoking
1081c0f16c
remove blank line from basic-template
2016-01-02 20:23:07 +09:00
nazoking
3302b607f1
use real database
2016-01-02 20:23:07 +09:00
nazoking
f13a3ee580
for bootstrap 3
2016-01-02 20:23:07 +09:00
nazoking
927969ac17
remove println(for debug)
2016-01-02 20:23:07 +09:00
nazoking
2d8aa4f8b5
update button
2016-01-02 20:23:07 +09:00
nazoking
645af4d2c0
add protected-branch feature on pull-request page
...
* show commit-status if context is require status checks to pass.
* disable merge if new commit-id has not `commit-status` ok on `Status-checkes`.
* if some status includes required is not success, merge button is disabled.
* if any required status is success, and some status not includes required, merge button is active, but button color is white.
* if any required status is success, merge button is active, and button color is green.
2016-01-02 20:20:24 +09:00
nazoking
34240d16b5
Protected mark(octicon-shield) on Branches page
2016-01-02 20:20:24 +09:00
nazoking
89210985d4
Readonly on online-editor
2016-01-02 20:20:24 +09:00
nazoking
9d6258861a
add protected branch list on branch setting page.
2016-01-02 20:20:24 +09:00
nazoking
6661314be5
Add git proection api and form
2016-01-02 20:20:24 +09:00
nazoking
e187d026cc
create repository setting branches page and move default branch setting to there.
2016-01-02 20:20:24 +09:00
nazoking
100b34085c
fix 'cannot create a JUnit XML printer. Please check that specs2-junit.jar is on the classpath'
2016-01-02 18:54:56 +09:00
Naoki Takezoe
ba75079409
Fix repository creation error
2016-01-02 03:08:09 +09:00
Naoki Takezoe
cbb847704b
Fix compilation error in testcase
2016-01-02 03:07:53 +09:00
Naoki Takezoe
739c99edce
(refs #970 )Display permission change
2016-01-02 02:42:38 +09:00
Naoki Takezoe
af2e2f5fd1
Merge branch 'viliamjr-wiki-sidebar'
2016-01-01 22:46:31 +09:00
Naoki Takezoe
09fcf9c003
Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar
...
# Conflicts:
# src/main/twirl/gitbucket/core/wiki/page.scala.html
2016-01-01 22:45:54 +09:00
Naoki Takezoe
5dad0777d7
Deploy assembly jar to snapshot repository if version ends with "-SNAPSHOT"
2016-01-01 19:57:17 +09:00
Naoki Takezoe
be3aa21651
Fix compilation error caused by JGit update
2016-01-01 17:49:32 +09:00
Naoki Takezoe
abd729e45f
Update depended libraries
2016-01-01 17:43:22 +09:00
Naoki Takezoe
162e9a9feb
Update version to 3.11.0-SNAPSHOT
2016-01-01 15:12:06 +09:00
Naoki Takezoe
7500d017d5
Fix dropdown bug
2016-01-01 14:42:08 +09:00
Naoki Takezoe
e8c4004d5a
Remove file appender
2016-01-01 13:13:30 +09:00
Naoki Takezoe
a6f4d9d7cf
Upgrade scalatra-forms to 1.0.0 that supports Scalatra 2.4.0
2015-12-31 02:33:11 +09:00
Naoki Takezoe
3399278925
(refs #738 )Revert content type detection
...
because Scalatra automatic charset detection issue has been fixed in Scalatra 2.4.0.
https://github.com/scalatra/scalatra/pull/500
2015-12-30 10:58:06 +09:00
Naoki Takezoe
4457a317e6
(refs #815 )Upgrade Scalatra to 2.4.0
2015-12-30 05:27:09 +09:00
Naoki Takezoe
990d082422
3.10 release
2015-12-30 01:18:13 +09:00
Naoki Takezoe
dfe3fbc02f
Bump up H2 to 1.4.190
2015-12-29 01:37:52 +09:00
Naoki Takezoe
c077dd0046
Rename logback-test.xml to logback-dev.xml
2015-12-27 14:40:54 +09:00
Naoki Takezoe
9cc6beead7
(refs #990 )Provides path for raw contents instead of ?raw=true
2015-12-26 22:48:28 +09:00
Naoki Takezoe
92f6792ad9
Adjust format
2015-12-26 21:20:09 +09:00
Naoki Takezoe
25031eadfb
Merge pull request #1017 from swaldman/minor-c3p0-tweaks
...
Upgrade c3p0 and tweak default config to avoid Tomcat issues
2015-12-26 17:00:33 +09:00
Naoki Takezoe
a7024615e1
Merge pull request #1020 from P1tt187/sshd-RSA-keyprovider
...
update sshd dependency, rsa keyprovider as default
2015-12-26 16:59:30 +09:00
Naoki Takezoe
8191a4bedb
(refs #1004 )Fix edit webhook link url
2015-12-26 03:25:49 +09:00
Naoki Takezoe
7e1f5aa353
Fix branch control dropdown
2015-12-25 10:26:30 +09:00
Fabian Markert
44e161f6ec
update version
2015-12-24 17:16:20 +01:00
Fabian Markert
7bd17ed038
update sshd dependency
...
migrate to new sshd api
change the default key provider algorithm to RSA
2015-12-24 17:11:40 +01:00
Naoki Takezoe
a47404130b
Don't break lines in Wiki or markdown files on the repository viewer
2015-12-24 02:58:39 +09:00
