Commit Graph

286 Commits

Author SHA1 Message Date
takezoe
b031103df8 (refs #218)Separate StringUtil#extractCloseId() to add unit test. 2014-03-02 04:49:14 +09:00
takezoe
0c683d4f75 Merge branch 'closing-issues-via-commit-messages' of https://github.com/odz/gitbucket into odz-closing-issues-via-commit-messages 2014-03-02 04:02:45 +09:00
Naoki Takezoe
200d095034 Merge pull request #290 from lefou/compare-email-caseinsensitive
Compare email adresses case-insensitive.
2014-03-02 01:35:00 +09:00
takezoe
98266fe0e1 (refs #279)Fix webhook URL to use the configured base URL. 2014-03-01 13:05:42 +09:00
Tobias Roeser
f13d757976 Compare email adresses case-insensitive. 2014-02-28 16:28:40 +01:00
odz
8b5414c8f7 Merge branch 'master' into closing-issues-via-commit-messages
Conflicts:
	src/main/scala/app/PullRequestsController.scala
	src/main/scala/servlet/GitRepositoryServlet.scala
2014-02-25 00:07:25 +09:00
takezoe
a76792ced4 (refs #279)Add configuration to specify the base URL. But still one problem has not been resolved. 2014-02-22 14:20:51 +09:00
takezoe
d683dd2c38 (refs #268)Fix label filter bug when label contains whitespaces. 2014-02-08 07:04:18 +09:00
takezoe
b885a1a0d4 (refs #256)If account is already registered but disabled, authentication fails. 2014-02-01 17:05:33 +09:00
takezoe
e87c69f989 (refs #251)Remove BOM from UTF-8 string. 2014-02-01 07:08:03 +09:00
takezoe
5a1f541e13 (refs #245)Add full name attribute for LDAP authentication. 2014-01-25 05:07:32 +09:00
takezoe
fba81138ea (refs #102)Experimental implementation of transfer repository ownership 2014-01-18 04:14:32 +09:00
takezoe
f33b398428 (refs #102)Change for transfer repository owner. 2014-01-16 19:39:14 +09:00
takezoe
ebcc5ab4b1 (refs #101)Update links in activity message also. 2014-01-15 04:35:38 +09:00
takezoe
df1f3d8a00 (refs #101)Modification to add rename repository name. 2014-01-13 02:09:05 +09:00
takezoe
0e9bf59c0f Remove some functions from ControlUtil. 2013-12-15 04:21:39 +09:00
odz
dc78dc9b0d Close issues via commit messages 2013-11-30 18:57:19 +09:00
takezoe
7e10618ceb Merge branch 'pullreq-update-in-push' of https://github.com/odz/gitbucket into odz-pullreq-update-in-push
Conflicts:
	src/main/scala/app/PullRequestsController.scala
2013-11-30 02:35:21 +09:00
odz
223ba791fe Fetch pull request from source repository after updating repository. 2013-11-20 23:59:26 +09:00
odz
0d49bbe7ac Resolves error when deleting repsository with PR. 2013-11-20 01:53:18 +09:00
Naoki Takezoe
f38924c7fe Merge pull request #190 from jtyr/master
Adding LDAP StartTLS support
2013-11-15 09:10:38 -08:00
Jiri Tyr
612aba1365 Use the system keystore by default
Default system keystore is in:
$JAVA_HOME/lib/security/jssecacerts
or in:
$JAVA_HOME/lib/security/cacerts

Custom keystore can be set either in /etc/sysconfig/gitbucket by
specifying the following option:
GITBUCKET_JVM_OPTS="-Djavax.net.ssl.trustStore=/path/to/your/cacerts"
or in Gitbucket's System Settings.
2013-11-07 16:57:40 +00:00
Jiri Tyr
cc241c5a7b Moving keystore definition into settings 2013-11-05 15:08:03 +00:00
takezoe
3dec2b8159 Fix test case. 2013-11-03 15:12:01 +09:00
takezoe
2118f8c764 (refs #114)Add group deletion. 2013-11-03 01:37:23 +09:00
takezoe
81e2ac44c3 (refs #114)Remove user related data when user is removed. 2013-11-02 14:01:07 +09:00
takezoe
07bb326c06 (refs #114)Add remove option to user management. 2013-11-02 13:44:47 +09:00
Jiri Tyr
f311339786 Adding LDAP StartTLS support
Some LDAP server do not allow authenticate with unencrypted password.
This patch is adding the StartTLS support which takes care of the
encryption.

In order to enable the StartTLS, go to "System Settings" and select the
"Enable StartTLS" in the Authentication section. Then make sure that you
add your LDAP certificate into the Java keystore:

$ keytool -import \
          -file /etc/pki/tls/certs/cacert.pem \
          -alias myName \
          -keystore /var/lib/gitbucket/keystore

You can list all keys from the keystore like this:

$ keytool -list -keystore /var/lib/gitbucket/keystore
2013-11-01 15:44:19 +00:00
takezoe
9c60b69c88 (refs #114)Add logical remove flag to ACCOUNT. 2013-11-01 03:39:59 +09:00
takezoe
c7eaebf597 (refs #186)Show private repositories in the account page. 2013-11-01 03:25:06 +09:00
takezoe
60e1052d33 (refs #179)Fetch from the source repository before pull request is referred. 2013-11-01 03:12:56 +09:00
takezoe
8ec4b52dda (refs #167)Add pusher info to WebHook 2013-10-31 02:07:54 +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
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
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
takezoe
2235dab550 (refs #174)Fix commit hook for DELETE command. 2013-10-26 01:40:26 +09:00
Naoki Takezoe
90ab882e8e Merge pull request #147 from xuwei-k/AccountServiceSpec
add AccountServiceSpec
2013-10-21 09:01:11 -07:00
shimamoto
7afe7fbb5f (refs #103) Add issue comment deletion. 2013-10-21 05:11:53 +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
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
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
xuwei-k
3351eabc4f add AccountServiceSpec 2013-10-11 13:08:58 +09:00
shimamoto
c16b89b0be (refs #99) Improved to configure the FROM field of the email. 2013-10-10 23:57:45 +09:00
Tomofumi Tanaka
e667b6c139 (refs #139) Add info log for debugging LDAP Auth 2013-10-10 00:57:46 +09:00