Tomofumi Tanaka
7e77c102b0
(refs #179 ) Merge branch 'improve-pullreq-performance'
2013-10-31 22:15:47 +09:00
takezoe
a452c582ab
Fix compilation error.
2013-10-31 03:08:28 +09:00
Tomofumi Tanaka
9265c68383
(refs #179 ) Refactor
2013-10-31 01:38:29 +09:00
Tomofumi Tanaka
4bd2d78ecb
Merge remote-tracking branch 'master' into improve-pullreq-performance
2013-10-31 00:56:18 +09:00
Tomofumi Tanaka
e7aa766d0a
(refs #179 ) Remove refs/pull/${issueId}/merge
2013-10-31 00:50:27 +09:00
Tomofumi Tanaka
7d8300b3ce
(refs #179 ) Fetch from fork branch before merge
2013-10-31 00:30:18 +09:00
Tomofumi Tanaka
af8a1234ed
(refs #179 ) Improve merge performance
...
* merge without tmp dir repository
* remove merging ops from mergeguid
2013-10-31 00:23:09 +09:00
takezoe
bd0ecd0a9d
Improve repository creation to not use the working repository.
2013-10-30 14:52:55 +09:00
takezoe
e79ded934f
Display selected page differences only.
2013-10-30 11:37:53 +09:00
takezoe
68b25ddbb5
(refs #180 )Implementing reverting from history without ApplyCommand.
2013-10-30 08:20:17 +09:00
Tomofumi Tanaka
f96040eade
Improve checkConflict
...
* Delete temporary RefSpec after checkConflict
* mergeguide use checkconflictInPullRequest instead of checkconflict
2013-10-30 01:33:56 +09:00
takezoe
afb2306904
(refs #180 )Fix saving and deleting Wiki page.
2013-10-29 11:39:38 +09:00
Tomofumi Tanaka
dcbf283c9d
Improve checkConflict
2013-10-29 01:24:06 +09:00
takezoe
60e7165983
(refs #104 )Zip file is exported from the bare repository directly.
2013-10-24 11:29:23 +09:00
takezoe
0d0bf4ad3f
Don't add group account as a collaborator.
2013-10-24 02:08:14 +09:00
takezoe
53fa60b0f8
Exclude owner from assigned user list in the group repository.
2013-10-24 02:00:14 +09:00
Naoki Takezoe
a697f186af
Merge pull request #164 from smly/feature/bugfix-redirect-encode
...
Fix a problem to redirect wikipage named by multi-byte characters
2013-10-20 19:33:37 -07:00
shimamoto
7afe7fbb5f
(refs #103 ) Add issue comment deletion.
2013-10-21 05:11:53 +09:00
Kohei Ozaki
37358e9c8c
Fix a problem to redirect wikipage named by multi-byte characters
...
In some specific case, redirect path (created from route params) is incorrect.
`redirectUrl` is expected to be encoded,
but scalatra decodes route params by rl.UrlCodingUtils via ScalatraBase.UriDecoder.
To avoid this problem, I add dirty workaround to encode redirect path.
2013-10-19 14:20:35 +09:00
takezoe
0e7078c479
(refs #151 )Add unique checking to group creation.
2013-10-14 14:44:26 +09:00
takezoe
ebf4e5f2e9
Merge branch 'account-full-name' of https://github.com/robinst/gitbucket into robinst-account-full-name
...
Conflicts:
src/main/scala/app/PullRequestsController.scala
2013-10-14 13:40:06 +09:00
xuwei-k
5a3207ae42
avoid NumberFormatException
2013-10-14 03:26:47 +09:00
xuwei-k
dae0d0ad4b
use FileUtil.withTmpDir and FileUtil.using
2013-10-11 02:44:03 +09:00
takezoe
cf79ac1069
(refs #142 )Fix NoSuchElementException for empty repository.
2013-10-11 02:42:07 +09:00
shimamoto
c16b89b0be
(refs #99 ) Improved to configure the FROM field of the email.
2013-10-10 23:57:45 +09:00
xuwei-k
84ce2cac8d
remove unnecessary code
2013-10-09 11:09:06 +09:00
Robin Stocker
13bff2963e
Add full name to account and use it to create commits ( #125 )
...
The Git practice is to use the full name when creating commits, not a
user name. This commit fixes that by introducing a fullName field to
Account and using it when creating commits.
For migrating from earlier versions, the user name is used as an initial
value for the full name field.
2013-10-06 23:11:09 +02:00
takezoe
e94411ebeb
(refs #121 )Create WebHookPayload only when web hook has been registered.
2013-10-06 23:22:29 +09:00
takezoe
380cdbcf75
Add FileUtil#getContentType().
2013-10-04 04:17:30 +09:00
takezoe
f4f2bf34fc
(refs #73 )Add Wiki conflict detection and some fix.
2013-10-04 03:48:51 +09:00
takezoe
d95bd20cbe
Fix commit message for Wiki editing.
2013-10-03 11:44:15 +09:00
takezoe
70ca98d6a2
(refs #38 )Add reverting wiki from history.
2013-10-03 03:42:38 +09:00
takezoe
cf7caf55da
(refs #108 )Add ZIP download button to the repository viewer tab.
2013-10-03 00:57:17 +09:00
takezoe
5430564065
(refs #105 )Specify suitable Content-Type header for downloaded file.
2013-09-29 16:27:40 +09:00
takezoe
bb03a6fc9b
(refs #94 )The merge-guide is separated as HTML fragment and retrieve them by Ajax.
2013-09-23 13:25:06 +09:00
takezoe
d34118bdfd
Define request attribute keys.
2013-09-23 02:03:10 +09:00
takezoe
c57bc487a3
Define session keys.
2013-09-23 00:51:57 +09:00
takezoe
296fc9a3df
Improve session handling.
2013-09-23 00:18:38 +09:00
takezoe
fd8b5780f3
Use ControlUtil.
2013-09-22 19:28:14 +09:00
takezoe
602b6c635a
Add RichRequest which extends HttpServletRequest.
2013-09-22 14:25:50 +09:00
takezoe
f30c9f6171
Use ControlUtil.
2013-09-22 01:24:04 +09:00
takezoe
e89b2020a3
Use ControlUtil.
2013-09-21 22:13:15 +09:00
takezoe
b4dd067d61
Introduce ControlUtil which provides control facilities such as using() or defining().
2013-09-19 18:53:14 +09:00
takezoe
73d9e69e43
(refs #74 )Small fix for test hook.
2013-09-19 02:40:07 +09:00
takezoe
7e4c29f4cf
(refs #74 )Remove an auxiliary constructor from case class because json4s can't serialize correctly if case class have that.
2013-09-19 00:47:46 +09:00
takezoe
3c865ea20b
(refs #74 )Remove an unnecessary action and add TODO.
2013-09-18 20:12:47 +09:00
takezoe
d8698d02b7
(refs #74 )Add "Test Hook" button.
2013-09-18 20:10:53 +09:00
takezoe
aa8da1b046
Fix TODO.
2013-09-18 15:28:59 +09:00
takezoe
06b0dbf2e5
Remove TODO.
2013-09-18 14:24:15 +09:00
takezoe
4d0ab514fb
(refs #74 )Remove web hook URL is available.
2013-09-12 08:41:26 +09:00
