Commit Graph

4011 Commits

Author SHA1 Message Date
Naoki Takezoe
1201271949 Merge branch 'master' into solidbase-integration
Conflicts:
	src/main/scala/gitbucket/core/model/Profile.scala
	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
2016-01-19 15:31:26 +09:00
Naoki Takezoe
5c12cca7f5 Merge branch 'team-lab-feature/protected-branch' 2016-01-19 15:17:52 +09:00
Naoki Takezoe
206d597d9b Fix testcase 2016-01-19 12:50:54 +09:00
Naoki Takezoe
1b4c621fef Change CommitHook to ReceiveHook 2016-01-19 12:26:20 +09:00
Naoki Takezoe
03d4b9e9c6 Change CommitHook interface 2016-01-18 19:46:30 +09:00
nazoking
82a9d9f7cf Change action-comment styles that follow github. 2016-01-18 19:36:34 +09:00
Andreas Jaggi
3e79dcf7a4 Limit recent updated repositories list. #1011 2016-01-17 13:20:37 +01:00
Naoki Takezoe
c9f3ec12a7 Update README.md 2016-01-17 15:24:11 +09:00
Naoki Takezoe
b781696803 Update README.md 2016-01-17 15:20:54 +09:00
Naoki Takezoe
19e74a4fe1 Remove unused model and service for PLUGIN table 2016-01-17 13:29:27 +09:00
Naoki Takezoe
130aa1e515 Merge branch 'master' into solidbase-integration 2016-01-17 12:57:52 +09:00
Naoki Takezoe
8dcb8c2ecb Fix testcase 2016-01-17 01:48:56 +09:00
Naoki Takezoe
b599219852 Add commit hook extension point for plugins 2016-01-17 01:38:11 +09:00
Naoki Takezoe
58078989f8 Small fix about code style 2016-01-17 01:08:18 +09:00
Naoki Takezoe
4276c0970b Fix version and view 2016-01-17 00:18:23 +09:00
Naoki Takezoe
4abd4a4bac Merge branch 'feature/protected-branch' of https://github.com/team-lab/gitbucket into team-lab-feature/protected-branch 2016-01-17 00:01:18 +09:00
Naoki Takezoe
2b2ae718f7 Fix preview bug in online editor of repository viewer 2016-01-16 22:37:40 +09:00
Naoki Takezoe
ef201e3319 Update haeding style to bold 2016-01-16 22:37:07 +09:00
Naoki Takezoe
0ab28e6daa (refs #1031)Fix issue link processing in Markdown 2016-01-16 22:14:45 +09:00
Naoki Takezoe
9b3e8bd22b Fix Markdown preview style
However styles in markdown-body affect tab. So there are invalid margin at the top of the tab.
2016-01-16 22:00:29 +09:00
Naoki Takezoe
15e8527e01 (refs #984)Fix special character problem in repository viewer 2016-01-16 14:27:44 +09:00
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
e92d1eae5a Add migration process from 3.10 2016-01-16 13:54:06 +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
Naoki Takezoe
8b44a00299 Fix foreign key cascading 2016-01-13 11:57:36 +09:00
Naoki Takezoe
f5c1c0703d Fix compilation error in testcase 2016-01-13 11:47:59 +09:00
Naoki Takezoe
5036b1a1aa Replace migration system with Solidbase 2016-01-10 01:43:13 +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
766867f341 add test 2016-01-02 20:41:23 +09:00