Commit Graph

5061 Commits

Author SHA1 Message Date
Naoki Takezoe
13622c5970 Merge pull request #1957 from kounoike/fix-1956
fix #1956
2018-04-16 09:10:09 +09:00
KOUNOIKE Yuusuke
0c3c25b7c0 fix #1956 2018-04-15 21:53:08 +09:00
KOUNOIKE Yuusuke
6e31f19e9b Improve webhook payload compatibility for discord. close #1888 2018-04-15 15:13:10 +09:00
KOUNOIKE Yuusuke
52ec97b87e drop duplicated line. 2018-04-15 13:49:33 +09:00
KOUNOIKE Yuusuke
a5ccea6413 add comma 2018-04-15 13:34:57 +09:00
KOUNOIKE Yuusuke
cc091a65a4 Merge remote-tracking branch 'upstream/master' into pr-multi-mailaddress
# Conflicts:
#	src/main/scala/gitbucket/core/GitBucketCoreModule.scala
2018-04-15 13:33:08 +09:00
KOUNOIKE Yuusuke
884d4935cc Check duplicate across primary/extra mail addresses. 2018-04-15 13:28:03 +09:00
Naoki Takezoe
35655f33c7 Change local storage key 2018-04-15 12:11:31 +09:00
Naoki Takezoe
5022702796 Merge pull request #1954 from gitbucket/keep-editor-wrap
Keep wrap mode of Ace editor using localStorage
2018-04-15 12:05:15 +09:00
KOUNOIKE Yuusuke
243833c3fc improve getAccountByMailAddress query. 2018-04-15 11:34:55 +09:00
Naoki Takezoe
3f1ea419d6 Keep wrap mode of Ace editor using localStorage 2018-04-15 02:11:16 +09:00
Yan Su
0c2c590678 Add X-Forwarded-Proto support for baseurl parsing 2018-04-13 17:57:11 +08:00
Naoki Takezoe
3ca73aaafb Disable removed user’s repositories 2018-04-13 17:03:57 +09:00
Naoki Takezoe
b4cf4bfb17 Disallow users and repositories which have different letter cases 2018-04-13 15:56:56 +09:00
Naoki Takezoe
5cb26247fc Update README.md and CHANGELOG.md for GitBucket 4.23.1 release 4.23.1 2018-04-10 02:38:06 +09:00
Naoki Takezoe
2e391144f2 Merge branch 'master' of https://github.com/gitbucket/gitbucket 2018-04-09 19:46:01 +09:00
Naoki Takezoe
bd69821f1d Bump to 4.23.1 2018-04-09 19:45:47 +09:00
Naoki Takezoe
d802ed099b Merge pull request #1944 from xuwei-k/sbt-1.1.3
sbt 1.1.3
2018-04-09 14:49:21 +09:00
kenji yoshida
170a48de36 sbt 1.1.3 2018-04-08 14:45:37 +09:00
Naoki Takezoe
1d2d33ba71 Merge pull request #1940 from gitbucket/fix-get-contents-api
Fix a bug that fails to get the list of files of the repository root
2018-04-08 01:11:23 +09:00
Naoki Takezoe
9bcc2a3202 Fix a bug that fails to get the list of files of the repository root 2018-04-03 02:00:07 +09:00
KOUNOIKE Yuusuke
d65637ce0c Add extra mail address support. close #652 2018-04-02 01:01:18 +09:00
Naoki Takezoe
2e910aebdc Merge pull request #1938 from xuwei-k/Xfuture
add -Xfuture option. fix warnings
2018-04-02 00:23:12 +09:00
Naoki Takezoe
a1621b49a6 Merge pull request #1937 from xuwei-k/sbt-1.1.2
sbt 1.1.2
2018-04-02 00:22:46 +09:00
xuwei-k
ac6fbd0bfa add -Xfuture option. fix warnings
view bounds and procedure syntax are deprecated
2018-04-01 22:43:47 +09:00
kenji yoshida
5305b1b09a sbt 1.1.2 2018-04-01 22:38:37 +09:00
kenji yoshida
4f92739d73 check scalafmt in travis (#1936)
format test and sbt files
2018-04-01 22:24:51 +09:00
Naoki Takezoe
cadd128299 Merge pull request #1934 from gitbucket/apply-scalafmt
Apply scalafmt
2018-04-01 14:42:48 +09:00
Naoki Takezoe
b642783610 Apply scalafmt 2018-04-01 12:01:17 +09:00
Naoki Takezoe
4aaaff5de7 Merge pull request #1923 from yaroot/scalafmt
Add scalafmt
2018-04-01 11:55:21 +09:00
Naoki Takezoe
2fda39ddbe Merge pull request #1932 from stephengroat/patch-1
better looking gitter badge
2018-04-01 11:50:23 +09:00
Stephen
6753bd085f better looking gitter badge 2018-03-31 08:55:21 -07:00
Naoki Takezoe
2d8513e18a Merge pull request #1931 from gitbucket/fix-release-file-handling
Fix file upload bug in the release page
2018-03-31 23:11:57 +09:00
Naoki Takezoe
047c877d83 Fix file upload bug in the release page 2018-03-31 22:22:50 +09:00
Naoki Takezoe
b09c69afd7 Merge pull request #1928 from vmi/tomcat-shutdown
Fix that Tomcat deployed with GitBucket can not shutdown.
2018-03-31 02:35:44 +09:00
Naoki Takezoe
6713dd97f5 Merge pull request #1927 from kounoike/pr-render-for-binary
Render by plugin even if file is binary
2018-03-31 02:34:44 +09:00
KOUNOIKE Yuusuke
d5b2a9d6b5 fix typo in ApiPlugin 2018-03-31 02:33:16 +09:00
Naoki Takezoe
964f6d3c82 Merge remote-tracking branch 'origin/release/gitbucket-4.23.0' 4.23.0 2018-03-31 01:02:47 +09:00
Naoki Takezoe
f1164e7790 Revert "fix typo in ApiPlugin"
This reverts commit de8e553906.
2018-03-31 01:00:12 +09:00
Naoki Takezoe
b8f1736a09 Update README.md and CHANGELOG.md for 4.23.0 release 2018-03-30 15:51:22 +09:00
KOUNOIKE Yuusuke
de8e553906 fix typo in ApiPlugin 2018-03-30 01:17:48 +09:00
IWAMURO Motonori
d6c9101b83 Fix that Tomcat deployed with GitBucket can not shutdown. 2018-03-29 22:03:13 +09:00
Naoki Takezoe
50137c5546 Bump gitbucket-pages-plugin to 1.7.0 2018-03-28 00:53:53 +09:00
KOUNOIKE Yuusuke
9e131c8970 Render by plugin even if file is binary 2018-03-28 00:34:35 +09:00
Naoki Takezoe
8733b8eddd Bump gist plugin and notifications plugin 2018-03-27 09:22:55 +09:00
Naoki Takezoe
a0c06855d2 Bump to 4.23.0 2018-03-27 01:00:45 +09:00
Naoki Takezoe
64ce44243c Merge pull request #1921 from gitbucket/path-end-slash
Support all of paths which end with slash
2018-03-27 00:55:08 +09:00
Naoki Takezoe
66d2af1ef5 Fix redirection path 2018-03-26 16:19:17 +09:00
Yan Su
d155cb67b3 add scalafmt 2018-03-26 13:25:02 +08:00
Naoki Takezoe
7d7b13de6e Remove tail slash 2018-03-26 03:36:34 +09:00