yjkony
4e2a3fdbd0
Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty".
2014-03-11 12:56:00 +09:00
yjkony
8d200c72d3
Merge branch 'master' into add-features-to-ldapauth
2014-03-10 11:05:02 +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
yjkony
a335c31385
Revert unnecessary format changes.
2014-03-04 10:54:54 +09:00
takezoe
e3fd564efd
(refs #241 )Work for specifying group manager
2014-03-04 04:25:44 +09:00
yjkony
5e0619b500
Sync upstream/maste to master and Merge branch 'master' into add-features-to-ldapauth
...
Conflicts:
src/main/scala/app/IndexController.scala
src/main/scala/service/SystemSettingsService.scala
src/main/twirl/admin/system.scala.html
2014-03-03 15:46:38 +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
yjkony
639e7e0b3f
Add features (additional filter condition / disable mail resolve) to LDAP authentication.
2014-02-28 21:32:42 +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
takezoe
bf2ed81eb1
(refs #163 )Allow '.' in user name.
2013-10-19 12:56:55 +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
5a3207ae42
avoid NumberFormatException
2013-10-14 03:26:47 +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
Tomofumi Tanaka
e667b6c139
(refs #139 ) Add info log for debugging LDAP Auth
2013-10-10 00:57:46 +09:00
takezoe
380cdbcf75
Add FileUtil#getContentType().
2013-10-04 04:17:30 +09:00
