Commit Graph

4252 Commits

Author SHA1 Message Date
Naoki Takezoe
88427b893c Merge pull request #1883 from gitbucket/disable-merge-strategies
Add a option to enable/disable merge strategies
2018-02-11 13:51:45 +09:00
Naoki Takezoe
737b0a9bdf (refs #1859) Add options to manage merge strategies 2018-02-11 13:38:03 +09:00
Naoki Takezoe
c8a7ef2fdb Merge pull request #1867 from gitbucket/refine-system-settings-page
Refine the system settings page
2018-02-11 01:13:33 +09:00
Naoki Takezoe
6d6331bbf3 Refine system settings page
Fixup
2018-02-11 00:58:29 +09:00
Naoki Takezoe
d1f2a72f06 (refs #1863) Fix path separator encoding in file finder 2018-02-10 02:00:07 +09:00
Naoki Takezoe
576daa0669 (refs #1881) Apply max file size setting to file uploading and wiki editing page 2018-02-10 01:28:49 +09:00
Naoki Takezoe
934d1df991 Merge pull request #1878 from alejandroliu/OIC-fix
Assign dummy password to newly created users
2018-02-10 00:25:38 +09:00
Naoki Takezoe
aa7db68e68 Merge pull request #1882 from xuwei-k/sbt-1.1.1
sbt 1.1.1
2018-02-10 00:17:03 +09:00
xuwei-k
a1bb667ec4 sbt 1.1.1 2018-02-09 12:15:41 +09:00
Naoki Takezoe
90ae489d35 Fix a position of the source url field 2018-02-09 02:00:43 +09:00
Naoki Takezoe
5bbd4f533f Merge pull request #1866 from kounoike/pr-initialize-empty-commit
Add new initialize option as `git commit -m "..." --allow-empty"`
2018-02-09 01:12:47 +09:00
A Liu Ly
283baaed57 Fixed failing tests. 2018-02-07 08:05:21 +00:00
A Liu Ly
c1e2191120 Assign dummy password to newly created users 2018-02-05 23:38:41 +00:00
Naoki Takezoe
95acb8593a Merge pull request #1873 from kounoike/fix-1872
fix 1872.
2018-02-04 00:53:41 +09:00
KOUNOIKE Yuusuke
17d682f83b fix 1872.
java.io.File#getParent returns path with "\" instead of "/".
so don't use this method.
2018-02-01 02:41:43 +09:00
Naoki Takezoe
952c916e33 Remove context path from request uri in plugin routing 2018-01-30 11:26:15 +09:00
KOUNOIKE Yuusuke
3793a51e3f Add new initialize option as git commit -m "..." --allow-empty" 2018-01-28 18:59:39 +09:00
Naoki Takezoe
c8b6eb1bd9 Release 4.21.2 4.21.2 2018-01-27 21:54:55 +09:00
Naoki Takezoe
e46f1b0efc Merge branch 'kounoike-pr-fix-1829-mistake' 2018-01-27 21:49:20 +09:00
KOUNOIKE Yuusuke
395d6e4292 Remove extra close div tag which introduced by #1829 2018-01-27 20:06:45 +09:00
Naoki Takezoe
5d5dcad32c Update README.md and CHANGELOG.md 2018-01-27 12:59:35 +09:00
Naoki Takezoe
0d195a2e90 Merge pull request #1862 from kounoike/fix-1861
fix #1861
4.21.1
2018-01-27 12:49:48 +09:00
Naoki Takezoe
eb76db5f2c (refs #1858) Upgrade gist plugin 2018-01-27 12:48:45 +09:00
KOUNOIKE Yuusuke
9cc5d0ea17 fix #1861 2018-01-27 12:32:28 +09:00
Naoki Takezoe
1d98308a21 Fix date of 4.21.0 release 2018-01-27 00:35:56 +09:00
Naoki Takezoe
1ceace5539 Release 4.21.0 4.21.0 2018-01-27 00:30:42 +09:00
Naoki Takezoe
f13a473b4e Merge pull request #1856 from int128/oidc
OpenID Connect authentication
2018-01-25 16:25:48 +09:00
Hidetake Iwata
4e7c10c0dc Add a test 2018-01-25 14:41:59 +09:00
Hidetake Iwata
6db34cbb6b Refactor
- Use self type annotation instead of extending
- Aggregate OIDC context to a case class
- Use companion object instead of dedicated utility class
2018-01-25 12:19:47 +09:00
Naoki Takezoe
10205a8f9b Merge pull request #1857 from gitbucket/autherror-redirection
Return 401 for non-browsers when authentication is failed
2018-01-25 11:57:19 +09:00
Naoki Takezoe
d6df35f072 Return 401 for non-browsers when authentication is failed 2018-01-25 02:24:51 +09:00
Hidetake Iwata
ab10b77c50 Add OpenID Connect authentication feature 2018-01-24 12:24:16 +09:00
Naoki Takezoe
fb34b0909e Allow empty query for repository search 2018-01-24 03:15:17 +09:00
Naoki Takezoe
1a869f47e0 Merge pull request #1852 from int128/jrebel
Add support for new JRebel agent
2018-01-24 02:02:09 +09:00
Naoki Takezoe
d9aebbda62 Merge pull request #1851 from kounoike/pr-includegroups-option
Add "include group accounts" checkbox in User management
2018-01-24 01:53:20 +09:00
KOUNOIKE Yuusuke
987407909e fixed by review comment. 2018-01-23 21:33:42 +09:00
Hidetake Iwata
ba9c780602 Add support for new JRebel agent 2018-01-22 10:35:30 +09:00
Naoki Takezoe
ea5834f236 Merge pull request #1849 from McFoggy/issue-1844
add 'state' attribute to ApiPullRequest object
2018-01-21 01:13:06 +09:00
Naoki Takezoe
c3400f1091 Merge pull request #1853 from kounoike/pr-fix-1707
Fix #1707.
2018-01-21 01:10:30 +09:00
KOUNOIKE Yuusuke
7bd4d0970e Fix #1707. 2018-01-20 22:12:29 +09:00
KOUNOIKE Yuusuke
4a9303d7a7 Add "include group accounts" checkbox in User management 2018-01-20 13:00:43 +09:00
Naoki Takezoe
5f0cacd7c1 (refs #1846) Fix repository creation indicator's condition 2018-01-20 05:33:21 +09:00
Naoki Takezoe
f075132878 (refs #1848) Response refs which are started from specified ref string
when a exactly matched ref doesn't exist
2018-01-20 04:29:49 +09:00
Naoki Takezoe
b72556c007 (refs #1848) Partial fix get a reference API 2018-01-19 22:19:24 +09:00
Matthieu Brouillard
47489d9cb1 add 'state' attribute to ApiPullRequest object
fixes #1844
2018-01-19 11:37:13 +01:00
Naoki Takezoe
2ee70dc1b2 Merge pull request #1845 from bviktor/selinux
SELinux policy module, deploy script and instructions
2018-01-19 01:11:59 +09:00
Viktor Berke
3400b9a0ab SELinux policy module, deploy script and instructions 2018-01-17 23:08:44 +01:00
Naoki Takezoe
ad054d2f80 Delete removed release files when the release is updated 2018-01-14 02:12:09 +09:00
Naoki Takezoe
b0c2e5588c Fix downloading at the release page 2018-01-14 00:42:21 +09:00
Naoki Takezoe
1fe379111c Delete RELEASE_ID column from RELEASE and RELEASE_ASSET 2018-01-14 00:35:18 +09:00