Commit Graph

2663 Commits

Author SHA1 Message Date
Naoki Takezoe
f991f3b454 Merge branch 'cubdesign-name-truncate' 2016-01-16 14:18:12 +09:00
Naoki Takezoe
d6a39403e2 (refs #1035)Fixup 2016-01-16 14:18:03 +09:00
Naoki Takezoe
aa065fd030 Merge branch 'name-truncate' of https://github.com/cubdesign/gitbucket into cubdesign-name-truncate 2016-01-16 14:15:42 +09:00
Naoki Takezoe
b1b132dfc3 Merge pull request #1029 from team-lab/add-jrebel
Add jrebel
2016-01-15 01:23:41 +09:00
Naoki Takezoe
90c379b3b9 Update README.md 2016-01-13 14:01:40 +09:00
Naoki Takezoe
b71ff6f179 Update README.md 2016-01-13 13:55:59 +09:00
Takeo Tamura
f63542dbd0 delete white-space 2016-01-07 16:55:39 +09:00
Takeo Tamura
63e605d99c fix long file name text-overflow 2016-01-07 16:54:08 +09:00
Takeo Tamura
9e313bb2b3 fix long file name text-overflow 2016-01-07 16:40:44 +09:00
Naoki Takezoe
a03fc4cf4a Merge pull request #1032 from cubdesign/issues-badge
show side menu badge
2016-01-06 23:09:03 +09:00
Naoki Takezoe
d18f92cfbf Merge pull request #1033 from cubdesign/issues-pagination
fix pagination layout
2016-01-06 23:05:33 +09:00
Takeo Tamura
b96821ca44 fix pagination layout 2016-01-06 22:16:52 +09:00
Takeo Tamura
c61ecdef7a show badge 2016-01-06 22:07:20 +09:00
Naoki Takezoe
b50ca63c2b Merge pull request #1030 from team-lab/fix/image-diff
Fix/image diff
2016-01-05 01:09:15 +09:00
Naoki Takezoe
f6624c0002 Merge pull request #1027 from moccos/add_path_to_title
Add path and branch name to the page title
2016-01-05 01:07:47 +09:00
nazoking
d62fc6e135 fix image-diff style 2016-01-04 20:17:52 +09:00
nazoking
926c4d948f remove debug info 2016-01-04 17:11:53 +09:00
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
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 3.10 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