Commit Graph

1329 Commits

Author SHA1 Message Date
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
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
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
da62c6181e (refs #33)Fix avatar icon and account link in the commits page for pull request. 2013-10-16 04:10:00 +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
Naoki Takezoe
ba70fdda48 Merge pull request #156 from xuwei-k/deprecated
fix deprecation warning
2013-10-14 06:42:35 -07:00
takezoe
107622942b (refs #127)Fix testcase. 2013-10-14 14:54:38 +09: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
ff9b2dbe93 (refs #127)Display full name at the account page. 2013-10-14 14:05:25 +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
Naoki Takezoe
21c30583e5 Merge pull request #153 from xuwei-k/number-format-exception
avoid NumberFormatException
2013-10-13 21:32:52 -07:00
takezoe
d6c9ace306 Merge branch 'master' of https://github.com/takezoe/gitbucket 2013-10-14 13:25:01 +09:00
takezoe
faf1252597 (refs #154)Remove comparison for original repository which does not exist. 2013-10-14 13:24:49 +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
takezoe
841d442f0d (refs #131)Don't create Dropzone if image has been registered. 2013-10-12 02:54:33 +09:00
xuwei-k
3351eabc4f add AccountServiceSpec 2013-10-11 13:08:58 +09:00
takezoe
006e1bc61e Merge branch 'master' of https://github.com/takezoe/gitbucket 2013-10-11 03:10:10 +09:00
takezoe
35d1b4ea37 (refs #142)Hide "Fork" button for repositories which have no commit. 2013-10-11 03:09:25 +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
takezoe
25bbc00ff3 Display repository search field on pull request pages. 2013-10-10 19:00:56 +09:00
Tomofumi Tanaka
e667b6c139 (refs #139) Add info log for debugging LDAP Auth 2013-10-10 00:57:46 +09:00
xuwei-k
84ce2cac8d remove unnecessary code 2013-10-09 11:09:06 +09:00
Tomofumi Tanaka
f74f2c47d3 (refs #120) URL encode tag name
URL encode tag name URL like branch name.
And rename encodeBranchName to encodeRefName.
2013-10-09 09:59:30 +09:00
takezoe
72b25591a5 Resolve length issue in Slick.
https://github.com/slick/slick/issues/170
2013-10-09 03:11:27 +09:00
Mark Derricutt
49fbc5cb62 Change link text to 'Older'
Updates the link text for previous commits to read 'Older' and not 'Order'.
2013-10-08 11:34:02 +13:00
Tomofumi Tanaka
c1f98ac481 (refs #120) Use encodeBranchName to tab links 2013-10-07 23:55:27 +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