Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-09 06:55:54 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,061 Commits 14 Branches 116 Tags
disable-github-actions-cache
Commit Graph

5061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Uli Heller
f62cf409eb Upgraded to mariadb-java-client-2.2.1 2017-12-27 10:07:49 +01:00
Uli Heller
47845dfe1b jgit-4.9.2.201712150930-r 2017-12-27 10:01:34 +01:00
Naoki Takezoe
b7bb6b0787 Update plugins.json schema 4.20.0 2017-12-23 04:31:01 +09:00
Naoki Takezoe
ea41786f8c Fixup 2017-12-23 02:43:11 +09:00
Naoki Takezoe
962ae2130e Update README and CHANGELOG for GitBucket 4.20.0 release 2017-12-23 02:43:11 +09:00
Naoki Takezoe
90ea05f2a1 Merge pull request #1814 from gageas/fix-typo 
Fix typo in style attribute
 2017-12-22 03:27:37 +09:00
gageas
f8bda516d6 Fix typo in style attribute 
Because of the typo, image displayed in unintended aspect ratio, in some case.
 2017-12-21 22:49:01 +09:00
Naoki Takezoe
378c031ecb Merge pull request #1813 from atware/WIP-webhook-create-event 
support CreateEvent in webhook
 2017-12-21 18:42:58 +09:00
Naoki Takezoe
9a5db80dea (refs #1783) hide overflowed chars in the sidebar 2017-12-21 18:41:19 +09:00
Naoki Takezoe
992eb0ceda Bump to 4.20.0 2017-12-21 15:22:07 +09:00
guyon
39e1ac2398 support CreateEvent in webhook 2017-12-21 15:21:51 +09:00
Naoki Takezoe
d1c77de5a0 Bump to 4.19.3 2017-12-21 15:21:07 +09:00
Naoki Takezoe
3f8069638c Merge pull request #1807 from uli-heller/mariadb-java-client-2.2.0 
Upgraded to mariadb-java-client-2.2.0
 2017-12-15 13:58:26 +00:00
Uli Heller
d62fc1185c Upgraded to mariadb-java-client-2.2.0 2017-12-14 07:59:19 +01:00
Naoki Takezoe
768706e1d1 Resurrect the pages plugin 2017-12-12 19:25:34 +09:00
Naoki Takezoe
8cc9771237 Merge pull request #1804 from gitbucket/show-conflict-files 
Show conflicting files if pull request can't be merged
 2017-12-12 13:32:31 +09:00
Naoki Takezoe
8df30ef01b Fix message 2017-12-12 13:06:04 +09:00
Naoki Takezoe
dd2e5bfedf Fix testcase 2017-12-12 12:04:24 +09:00
Naoki Takezoe
e3c7eb092f Fix merge failure 2017-12-12 12:02:04 +09:00
Naoki Takezoe
5b3c3e2e7c Merge branch 'master' into show-conflict-files 2017-12-12 11:58:57 +09:00
Naoki Takezoe
0e04925b6b Merge pull request #1802 from gitbucket/merge-strategy 
Add a pulldown menu to choose the merge strategy
 2017-12-12 11:48:12 +09:00
Naoki Takezoe
9a127256f3 Update reflog message 2017-12-12 11:39:00 +09:00
Naoki Takezoe
1033122fec Show conflicting files 2017-12-12 03:20:50 +09:00
Naoki Takezoe
847f96d537 Filter proposed branches which have been already raised as pull request 2017-12-12 02:25:36 +09:00
Naoki Takezoe
70f40846bb Show pull request proposals for the current repository 
if the repository doesn't have a parent repository.
 2017-12-12 00:39:30 +09:00
Naoki Takezoe
3a540aa660 Merge pull request #1803 from uli-heller/jgit-4.9.1.201712030800-r 
jgit-4.9.1.201712030800-r
 2017-12-12 00:14:52 +09:00
Naoki Takezoe
1adc9b3223 Refactoring 2017-12-11 20:20:58 +09:00
Naoki Takezoe
0309496df6 Fix rebase process 2017-12-11 20:16:11 +09:00
Uli Heller
f83ecac7ae jgit-4.9.1.201712030800-r 2017-12-11 08:52:00 +01:00
Naoki Takezoe
cd4d75e35e Format code 2017-12-11 12:33:06 +09:00
Naoki Takezoe
eb61bc50d6 Implemented squash merge strategy 2017-12-11 12:32:52 +09:00
Naoki Takezoe
4bbb22f73b Fix branch selector presentation 2017-12-11 03:47:02 +09:00
Naoki Takezoe
fcb374c5c2 Implemented rebase strategy 2017-12-10 18:04:45 +09:00
Naoki Takezoe
a03d1c97c2 Format code 2017-12-10 17:39:45 +09:00
Naoki Takezoe
2d58b7f2d7 Add a pulldown menu to choose the merge strategy 2017-12-10 14:59:53 +09:00
Naoki Takezoe
332a1b4b0b Add "Compare & pull request" button on the top of the repository viewer (#1476) 2017-12-09 04:52:21 +09:00
Naoki Takezoe
6bd58b0c45 Don't filter pull request target repositories 
because users who can access the forked repository should see the
original repositories and other forked repositories basically.
 2017-12-08 15:10:41 +09:00
Naoki Takezoe
fb175df851 (refs #1797) Fix accessible check for pull request repositories 2017-12-08 03:05:21 +09:00
Naoki Takezoe
b41aad92f2 Increase wait before refreshing the screen 2017-12-08 02:02:09 +09:00
Naoki Takezoe
aabae2ef7f Fix compilation error 2017-12-07 20:07:16 +09:00
Naoki Takezoe
0c3d1fd86d (refs #1799) Fix permalinks for pull request comments 2017-12-07 20:03:47 +09:00
Naoki Takezoe
adba849ec5 (refs #1798) Fix specification method of offset 2017-12-07 14:37:48 +09:00
Naoki Takezoe
8539486c6e Update README.md 2017-12-07 02:19:44 +09:00
Naoki Takezoe
86f4b41beb Fix comment reply form behavior in the diff view (#1796) 2017-12-06 14:38:05 +09:00
Naoki Takezoe
aa54eff3d6 Fix diff class attribute in split mode 2017-12-06 10:46:37 +09:00
Naoki Takezoe
27ab21c9a7 Fix file uploading issue 2017-12-06 03:53:43 +09:00
Naoki Takezoe
557ed827d0 Merge pull request #1792 from gitbucket/create-patch 
Add a Patch button to the diff view
 2017-12-05 18:42:05 +09:00
Naoki Takezoe
9cc466a727 Add a Patch button to the diff view 2017-12-05 13:06:17 +09:00
Naoki Takezoe
9a9be12324 Fix error 2017-12-05 12:37:18 +09:00
Naoki Takezoe
8e91b9f0b5 Improve DiffEntry searching and add download patch endpoint 2017-12-05 03:31:23 +09:00