Naoki Takezoe
|
7009aaeb24
|
Merge pull request #1675 from kounoike/pr-handle-errors
Handle errors to show errors prettify and logging it.
|
2017-08-29 01:26:21 +09:00 |
|
Naoki Takezoe
|
a135c6977f
|
Merge pull request #1683 from int128/fix-api-branch-with-slash
Fix branch API did not accept branch name with slash
|
2017-08-29 01:23:18 +09:00 |
|
Naoki Takezoe
|
55991a6f17
|
Merge pull request #1690 from uli-heller/blocking-slick-32-0.0.10
blocking-slick-32: 0.0.9 -> 0.0.10
|
2017-08-29 01:20:18 +09:00 |
|
Naoki Takezoe
|
17e1de6174
|
Bump to 4.16.0-SNAPSHOT
|
2017-08-28 19:24:06 +09:00 |
|
Uli Heller
|
12a58f393e
|
blocking-slick-32: 0.0.9 -> 0.0.10
|
2017-08-25 08:18:59 +02:00 |
|
Hidetake Iwata
|
ebb57a80e3
|
Fix branch API did not accept branch name with slash
|
2017-08-21 17:58:22 +09:00 |
|
Naoki Takezoe
|
7a53bd8766
|
Merge pull request #1672 from kounoike/pr-support-textmsg-in-email
Add support to MIME Text part in Email notification.
|
2017-08-21 01:04:00 +09:00 |
|
Naoki Takezoe
|
d8b46b194d
|
Merge branch 'master' into pr-support-textmsg-in-email
|
2017-08-20 23:39:05 +09:00 |
|
Yuusuke KOUNOIKE
|
5db7d863ff
|
Merge branch 'master' into pr-handle-errors
|
2017-08-20 22:28:34 +09:00 |
|
Naoki Takezoe
|
7d7c11aa1a
|
Merge AnonymousAccessController and GitHubCompatibleAccessController
|
2017-08-20 22:18:36 +09:00 |
|
Naoki Takezoe
|
95748a2f2f
|
Merge pull request #1678 from int128/github-compat-url
Improve GitHub compatible URL
|
2017-08-20 22:02:58 +09:00 |
|
KOUNOIKE Yuusuke
|
e77045abe3
|
Merge remote-tracking branch 'upstream/master' into pr-handle-errors
# Conflicts:
# src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
# src/main/scala/gitbucket/core/service/SystemSettingsService.scala
# src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
|
2017-08-20 21:50:34 +09:00 |
|
Naoki Takezoe
|
d73ddbdbcb
|
Merge branch 'master' into github-compat-url
|
2017-08-20 21:41:10 +09:00 |
|
Naoki Takezoe
|
8893a4a456
|
Merge pull request #1681 from gitbucket/drop-jdk9-build
Drop JDK9 build
|
2017-08-20 21:40:21 +09:00 |
|
Naoki Takezoe
|
608112ce22
|
Drop JDK9 build
|
2017-08-20 21:29:36 +09:00 |
|
Naoki Takezoe
|
2e9155fbcc
|
Merge branch 'master' into pr-support-textmsg-in-email
|
2017-08-19 01:59:14 +09:00 |
|
Naoki Takezoe
|
f33a30c697
|
Merge pull request #1676 from kounoike/pr-skin-selectable
add AdminLTE skin selection feature.
|
2017-08-18 20:15:22 +09:00 |
|
Hidetake Iwata
|
e208dd5966
|
Implement as controller instead of filter
|
2017-08-18 18:56:01 +09:00 |
|
KOUNOIKE Yuusuke
|
a6cb71f9c3
|
remove helpers.skinName. (by review comment)
|
2017-08-18 01:55:56 +09:00 |
|
Naoki Takezoe
|
91deeb969b
|
Merge branch 'master' into pr-skin-selectable
|
2017-08-18 01:00:20 +09:00 |
|
KOUNOIKE Yuusuke
|
040d812f2a
|
add debug option to SystemSettings. and error page shows stacktrace only for admin or debug settings.
|
2017-08-17 17:48:53 +09:00 |
|
Hidetake Iwata
|
772ac80764
|
Improve GitHub compatible URL
|
2017-08-16 10:09:08 +09:00 |
|
Yuusuke KOUNOIKE
|
ef67c94272
|
Merge branch 'master' into pr-support-textmsg-in-email
|
2017-08-15 03:26:17 +09:00 |
|
KOUNOIKE Yuusuke
|
fdb4a6bdc6
|
change interface to textMsg: String, htmlMsg: Option[String].
SystemSettingsController calls Mailer.send directly. fix it too.
|
2017-08-15 03:25:27 +09:00 |
|
Naoki Takezoe
|
57902af87c
|
(refs #1553)Fixup
|
2017-08-15 03:25:27 +09:00 |
|
KOUNOIKE Yuusuke
|
92fea3ff01
|
fix test.
|
2017-08-15 02:44:52 +09:00 |
|
Naoki Takezoe
|
cbd16169e4
|
(refs #1553)Fixup
|
2017-08-15 02:02:17 +09:00 |
|
KOUNOIKE Yuusuke
|
299df34bf4
|
add AdminLTE skin selection feature.
|
2017-08-14 22:12:17 +09:00 |
|
KOUNOIKE Yuusuke
|
48a92df719
|
Handle errors to show errors prettify and logging it.
|
2017-08-14 18:50:02 +09:00 |
|
shimamoto
|
b806439e2f
|
Merge branch 'master' into pr-support-textmsg-in-email
|
2017-08-14 18:45:34 +09:00 |
|
Naoki Takezoe
|
1db586c0bd
|
Merge pull request #1671 from kounoike/pr-send-comment-at-merged
Call addedComment hook(send notification) at PR merged.
|
2017-08-14 18:08:57 +09:00 |
|
KOUNOIKE Yuusuke
|
26e2bfbf43
|
Call addedComment hook(send notification) at PR merged.
|
2017-08-14 14:02:30 +09:00 |
|
KOUNOIKE Yuusuke
|
28c4ac6a19
|
Add support to MIME Text part.
|
2017-08-14 13:25:25 +09:00 |
|
Naoki Takezoe
|
c0d9d68fca
|
Merge pull request #1553 from kounoike/pr-show-commitstaus-in-commits
Show CommitStatus in commits page.
|
2017-08-14 12:01:40 +09:00 |
|
Yuusuke KOUNOIKE
|
122ed1dd0f
|
Merge branch 'master' into pr-show-commitstaus-in-commits
|
2017-08-14 01:14:49 +09:00 |
|
Naoki Takezoe
|
f18b83999a
|
Merge remote-tracking branch 'origin/master'
|
2017-08-13 01:59:17 +09:00 |
|
Naoki Takezoe
|
fc28aacb52
|
(refs #1664)Bump to markedj 1.0.14
|
2017-08-13 01:59:00 +09:00 |
|
Naoki Takezoe
|
efdfe2b1b5
|
Implementing get single commit API
|
2017-08-13 01:15:18 +09:00 |
|
Naoki Takezoe
|
2872da4f94
|
Merge pull request #1669 from kounoike/pr-fix-1552
Add query string for redirect, required by git-2.11-1.
|
2017-08-12 20:34:03 +09:00 |
|
KOUNOIKE Yuusuke
|
5d3c5e7f3c
|
Add query string for redirect, it required by git-2.12. close #1552
|
2017-08-12 15:16:55 +09:00 |
|
Naoki Takezoe
|
a86fb480b2
|
Merge pull request #1668 from gitbucket/thread-safe-collection
Improve concurrency of initializaton of the plugin system
|
2017-08-12 04:45:59 +09:00 |
|
Naoki Takezoe
|
7daf33c149
|
Merge branch 'master' into thread-safe-collection
|
2017-08-12 04:37:14 +09:00 |
|
Naoki Takezoe
|
0d9afdc939
|
(refs #1664)Bump to markedj 1.0.14-SNAPSHOT
|
2017-08-12 03:46:47 +09:00 |
|
Naoki Takezoe
|
a9a26193cd
|
Improve shutdown of the plugin system
|
2017-08-12 03:38:07 +09:00 |
|
Naoki Takezoe
|
684973ea85
|
Merge pull request #1666 from HairyFotr/patch-8
Fix lint and typos
|
2017-08-09 08:18:55 +09:00 |
|
HairyFotr
|
0149593272
|
Fix lint and typos
|
2017-08-08 21:37:35 +02:00 |
|
Naoki Takezoe
|
1ae3df76bd
|
Use thread-safe collection
|
2017-08-07 17:53:32 +09:00 |
|
Naoki Takezoe
|
d8e0a06d93
|
Add the support guidelines
|
2017-08-06 14:07:40 +09:00 |
|
Naoki Takezoe
|
b2d842ddd0
|
(refs #1654)Add --validate_password option
|
2017-08-06 03:49:04 +09:00 |
|
Naoki Takezoe
|
580374208f
|
Merge remote-tracking branch 'origin/master'
|
2017-08-06 03:38:25 +09:00 |
|