takezoe
8ec4b52dda
(refs #167 )Add pusher info to WebHook
2013-10-31 02:07:54 +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
35c8f02f90
(refs #180 )Fix compilation error.
2013-10-30 13:22:54 +09:00
takezoe
a1dc19fa26
(refs #180 )Remove Directory#getWikiWorkDir()
2013-10-30 11:39:55 +09:00
takezoe
e79ded934f
Display selected page differences only.
2013-10-30 11:37:53 +09:00
takezoe
ef3e7d9286
(refs #180 )Reverting from history without working repository is completed.
2013-10-30 11:13:10 +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
382c5c55ec
Remove unused import statement.
2013-10-29 11:52:42 +09:00
takezoe
afb2306904
(refs #180 )Fix saving and deleting Wiki page.
2013-10-29 11:39:38 +09:00
takezoe
2642da3be3
(refs #180 )Eliminating the working repository cloning in Wiki.
2013-10-29 09:22:37 +09:00
Tomofumi Tanaka
dcbf283c9d
Improve checkConflict
2013-10-29 01:24:06 +09:00
takezoe
2235dab550
(refs #174 )Fix commit hook for DELETE command.
2013-10-26 01:40:26 +09:00
takezoe
1e750f4b9d
(refs #171 )Fix link target of pull request number.
2013-10-25 04:28:58 +09:00
takezoe
06be5266fd
Fix refs message.
2013-10-24 15:04:32 +09:00
takezoe
60e7165983
(refs #104 )Zip file is exported from the bare repository directly.
2013-10-24 11:29:23 +09:00
takezoe
2968b92677
Add the commit link to refs comment.
2013-10-24 04:25:50 +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
90ab882e8e
Merge pull request #147 from xuwei-k/AccountServiceSpec
...
add AccountServiceSpec
2013-10-21 09:01:11 -07:00
shimamoto
254509f243
Fix bug.
2013-10-21 22:32:46 +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
takezoe
2316a80be9
(refs #163 )Remove escaping for '.'
2013-10-21 10:53:36 +09:00
shimamoto
bbcb04b263
Fix bug.
2013-10-21 05:16:55 +09:00
shimamoto
7afe7fbb5f
(refs #103 ) Add issue comment deletion.
2013-10-21 05:11:53 +09:00
takezoe
7c7da7379d
(refs #163 )Fixed
2013-10-19 18:48:50 +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
bf2ed81eb1
(refs #163 )Allow '.' in user name.
2013-10-19 12:56:55 +09:00
takezoe
f40c7ff4fa
Fix testcase.
2013-10-16 04:47:43 +09:00
takezoe
4d066738eb
Merge branch 'master' into #33_match-by-email
...
Conflicts:
src/main/scala/view/AvatarImageProvider.scala
2013-10-16 02:34:12 +09:00
Naoki Takezoe
cb12d03262
Merge pull request #143 from chris-vanvranken/master
...
retrieve LDAP emails as lowercase to avoid confusion
2013-10-15 10:28:05 -07:00
takezoe
9a6a2d9b78
(refs #33 )Improve avatar image searching behavior.
2013-10-16 02:24:40 +09:00
takezoe
ff0af477cb
Merge branch 'master' into #33_match-by-email
...
Conflicts:
src/main/scala/view/helpers.scala
2013-10-16 01:51:44 +09:00
Chris Van Vranken
05adf9345f
retrieve LDAP emails as lowercase to avoid confusing gravatar
2013-10-14 13:00:29 -04:00
xuwei-k
9794f14a65
fix deprecation warning. use HttpClientBuilder
...
https://github.com/apache/httpclient/blob/4.3/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java#L113
2013-10-14 14:52:42 +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
d772fc3ba2
refactoring. avoid Option#get
2013-10-14 01:18:31 +09:00
jparound30
faa6591d27
Fix activity message problem (related to #120 )
2013-10-12 20:50:35 +09:00
xuwei-k
3351eabc4f
add AccountServiceSpec
2013-10-11 13:08:58 +09:00
xuwei-k
dae0d0ad4b
use FileUtil.withTmpDir and FileUtil.using
2013-10-11 02:44:03 +09:00
xuwei-k
79e560b7bf
add FileUtil.withTmpDir
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
