Commit Graph

219 Commits

Author SHA1 Message Date
Tomofumi Tanaka
dd694d27b5 (refs #324)Update commitIdFrom when pullrequest branch is updated 2014-04-29 17:24:51 +09:00
shimamoto
8efd1da7e6 Merge branch 'fileupload' 2014-04-29 14:42:25 +09:00
takezoe
a97edb7ef5 (refs #13)File editing (add, edit and delete) in repository viewer is available. 2014-04-27 02:02:36 +09:00
Naoki Takezoe
0e5591017a Refactoring 2014-04-25 10:38:34 +09:00
Naoki Takezoe
ad244adbfa (refs #13)Commit from AceEditor is available. 2014-04-24 21:49:30 +09:00
shimamoto
296a0b2124 Removed FileUploadControllerBase(in the middle of improving file
upload).
2014-04-23 02:02:19 +09:00
Naoki Takezoe
da105b7180 Merge remote-tracking branch 'origin/master' 2014-04-11 11:58:51 +09:00
Naoki Takezoe
9c4f7cc530 Fix message for empty repository 2014-04-11 11:57:16 +09:00
Tomofumi Tanaka
7b7c0e1eee Fix getAllcommitIds bug in empty repository 2014-04-11 01:35:31 +09:00
Naoki Takezoe
3f76453f34 (refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table 2014-04-10 17:42:25 +09:00
takezoe
91bd9d1111 (refs #335)Oops, fix substring condition 2014-04-03 08:55:50 +09:00
takezoe
a6a08d13e9 (refs #335)Use string before '@' of mail address if user name is mail address in LDAP authentication. 2014-04-03 06:54:56 +09:00
takezoe
7f78a98de0 Display the first line of commit message on the file list 2014-03-15 18:03:52 +09:00
takezoe
fbba29e810 (refs #303)Submodule support 2014-03-08 02:58:49 +09:00
takezoe
b641bfb56a (refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2 2014-03-06 16:17:41 +09:00
takezoe
e0d266bf16 (refs #241)Allow group manager to use repository settings 2014-03-06 15:30:58 +09:00
takezoe
e3fd564efd (refs #241)Work for specifying group manager 2014-03-04 04:25:44 +09:00
takezoe
17920e1195 (refs #198)Allow group editing by group members. 2014-03-03 01:45:00 +09:00
takezoe
ec09adf03e Merge branch 'odz-closing-issues-via-commit-messages' 2014-03-02 04:49:53 +09:00
takezoe
b031103df8 (refs #218)Separate StringUtil#extractCloseId() to add unit test. 2014-03-02 04:49:14 +09:00
takezoe
7701521a2e Fix to use Exception#ignoring to ignore Exception. 2014-03-02 04:24:24 +09:00
takezoe
94576a876a (refs #280)Commit count limitation is changed to 10000 from 1000. 2014-03-02 01:23:30 +09:00
takezoe
374893a5ae Apply scala.util.control.Exception to exception handling. 2014-03-01 15:22:58 +09:00
takezoe
39091240ff (refs #60)Mentioned issue reference from other issue or issue comment. 2014-02-22 05:13:39 +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
226a8af262 Use old home if it exists. 2014-01-15 05:25:18 +09:00
takezoe
5e2dfffe25 Use FileUtils#moveDirectory() instead of File#renameTo() 2014-01-12 17:59:02 +09:00
takezoe
897f2ea6dd Update data directory checking condition. 2014-01-12 16:47:23 +09:00
takezoe
3d852a535d (refs #244)Change the default data directory to HOME/.gitbucket 2014-01-12 15:41:01 +09:00
takezoe
0e9bf59c0f Remove some functions from ControlUtil. 2013-12-15 04:21:39 +09:00
Piotr Adamski
47714eec45 Silenced compiler warnings 2013-12-03 18:41:41 +01:00
takezoe
b3669f6d66 (refs #204)Add some way to configure data directory.
1) system property of JVM (e.g. -Dgitbucket.home=PATH_TO_DATADIR)
2) java -jar gitbucket.war --data=PATH_TO_DATADIR
3) Add context parameter "gitbucket.home" to web.xml
2013-11-30 05:18:15 +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
shimamoto
13cf9d01f0 (refs #181) Fixed bug in charset. 2013-11-04 04:04:14 +09:00
takezoe
c517b44e82 Upgrade to scalatra-forms 0.0.4 2013-11-02 05:07:09 +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
Tomofumi Tanaka
7e77c102b0 (refs #179) Merge branch 'improve-pullreq-performance' 2013-10-31 22:15:47 +09:00
takezoe
0d3adb074d Release ObjectInserter after adding commit. 2013-10-31 02:18:48 +09:00
Tomofumi Tanaka
4bd2d78ecb Merge remote-tracking branch 'master' into improve-pullreq-performance 2013-10-31 00:56:18 +09:00
takezoe
bd0ecd0a9d Improve repository creation to not use the working repository. 2013-10-30 14:52:55 +09:00
takezoe
a1dc19fa26 (refs #180)Remove Directory#getWikiWorkDir() 2013-10-30 11:39:55 +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
60e7165983 (refs #104)Zip file is exported from the bare repository directly. 2013-10-24 11:29:23 +09:00
shimamoto
254509f243 Fix bug. 2013-10-21 22:32:46 +09: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
takezoe
7c7da7379d (refs #163)Fixed 2013-10-19 18:48:50 +09:00