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
f160952817
Remove unused import statement.
2013-10-30 13:20:13 +09:00
takezoe
9e5a302ab1
(refs #180 )Fix a problem about multi-byte characters.
2013-10-30 13:19:25 +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
599a808054
Fix a link to the committer page.
2013-10-29 11:53:05 +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
Naoki Takezoe
f38fa0132c
Merge pull request #178 from jtyr/master
...
Version bump in spec file
2013-10-28 07:15:07 -07:00
Jiri Tyr
569053f7e0
Version bump in spec file
2013-10-28 11:18:58 +00:00
Naoki Takezoe
037a97ff3d
Update README.md
2013-10-28 11:28:08 +09:00
Naoki Takezoe
6e169ab3c2
Update README.md
2013-10-26 01:46:39 +09:00
Naoki Takezoe
6ac27e89b3
Update README.md
2013-10-26 01:45:59 +09:00
takezoe
2235dab550
(refs #174 )Fix commit hook for DELETE command.
2013-10-26 01:40:26 +09:00
Naoki Takezoe
7604c2172f
Update README.md
2013-10-25 04:44:03 +09:00
takezoe
1e750f4b9d
(refs #171 )Fix link target of pull request number.
2013-10-25 04:28:58 +09:00
takezoe
d1f0d01ae8
Small fix for #170
2013-10-25 04:05:34 +09:00
Naoki Takezoe
167a0f28b2
Merge pull request #170 from jtyr/master
...
Allow to force HTTPS scheme
2013-10-24 12:00:25 -07: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
6dbfc12896
Merge branch 'master' of https://github.com/takezoe/gitbucket
2013-10-24 11:07:26 +09:00
takezoe
6d4b3e54d0
Fix style problem in Wiki.
2013-10-24 11:03:47 +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
Jiri Tyr
99517fa508
Fixing command line options in init.d script
...
Adding missing "--host" option and fixing the declaration of other
command line options.
2013-10-21 22:47:27 +01:00
Jiri Tyr
2e239d16d4
Refactorization of the https command line option
...
Renaming the flag variable and the Connector class.
2013-10-21 22:45:34 +01:00
Jiri Tyr
6de5babd5b
Merge remote-tracking branch 'upstream/master'
2013-10-21 17:40:42 +01:00
takezoe
f3ad1a019d
Small fix for #147
2013-10-22 01:09:22 +09:00
Naoki Takezoe
90ab882e8e
Merge pull request #147 from xuwei-k/AccountServiceSpec
...
add AccountServiceSpec
2013-10-21 09:01:11 -07:00
Jiri Tyr
53269096a6
Allow to force HTTPS scheme
...
If the standalone GitBucket instance runs behind HTTPS proxy, the
repository URL always shows HTTP scheme dispute the fact that the
connection is HTTPS. This patch is adding a command line option which
allows to force the HTTPS scheme.
2013-10-21 14:32:53 +01: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
Naoki Takezoe
41941df87a
Update README.md
2013-10-19 13:58:04 +09:00
takezoe
bf2ed81eb1
(refs #163 )Allow '.' in user name.
2013-10-19 12:56:55 +09:00
