Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 07:25:50 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,188 Commits 14 Branches 116 Tags
ac884bd7c3f454d9ea1648f807dbd4db64bdd02d
Commit Graph

797 Commits

Author SHA1 Message Date
takezoe
ac884bd7c3 (refs #196)Fire WebHook in merging pull request from Web GUI. 2013-12-12 04:23:43 +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
takezoe
bbff75e037 (refs #211)README.md detection is case insensitive and it also detect README.markdown as same as Github. 2013-11-30 04:22: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
takezoe
7f4def6b83 Ignore Exception instead of TransportException 2013-11-25 18:21:59 +09:00
takezoe
5790d246c8 Ignore TransportException if the source branch had been removed. 2013-11-25 18:16:38 +09:00
Naoki Takezoe
19dee09c86 Merge pull request #203 from olivierdagenais/FixManualMergeUrls 
Remove superfluous context.path
 2013-11-22 12:27:43 -08: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
Olivier Dagenais
8381e8122a Remove superfluous context.path 
It was generating URLs that look like
http://server.example.com/gitbucket/gitbucket/git/user/repo.git (notice
the extra "/gitbucket"?) when the WAR was deployed in Tomcat.
 2013-11-19 11:48:29 -05:00
Naoki Takezoe
f38924c7fe Merge pull request #190 from jtyr/master 
Adding LDAP StartTLS support
 2013-11-15 09:10:38 -08:00
takezoe
43152c9341 Upgrade scalatra-forms to 0.0.8. 2013-11-14 04:04:29 +09:00
takezoe
2b42e73530 (refs #173)Move BasicAuthenticationFilter to ScalatraBootstrap also. 2013-11-11 03:12:41 +09:00
Jiri Tyr
7174523ac5 Load Gravatar images always through HTTPS 
This patch will force to load Gravatar images always through HTTPS which
will fix the problem with mixed content when accessing the page through
HTTPS.

The problem is that if an HTTPS page includes HTTP content, the HTTP
portion can be read or modified by attackers, even though the main page
is served over HTTPS.
 2013-11-10 00:42:17 +00:00
takezoe
f573fef9eb (refs #173)Move TransactionFilter to ScalatraBootstrap from web.xml to support Tomcat 7.0.29 or before. 2013-11-10 05:24:38 +09:00
takezoe
b4250d8254 Merge remote-tracking branch 'origin/master' 2013-11-10 02:46:22 +09:00
takezoe
ac4d4de3c1 Fix redirect path encoding. 2013-11-10 02:45:54 +09:00
Naoki Takezoe
05e6d008fa Merge pull request #192 from xuwei-k/issue191 
add HARDWRAPS option
 2013-11-09 09:17:26 -08:00
takezoe
dd4abb2073 Upgrade to scalatra-forms 0.0.6. 2013-11-08 03:24:12 +09: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
xuwei-k
94dce09570 add HARDWRAPS option 2013-11-07 17:27:18 +09: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
641d506559 (refs #177)Fix regular expressions for issue link conversion. 2013-11-03 18:06:58 +09:00
takezoe
3dec2b8159 Fix test case. 2013-11-03 15:12:01 +09:00
takezoe
a0bd969140 (refs #114)Add functionality to remove account by themselves. 2013-11-03 14:54:28 +09:00
takezoe
b30d42a37b (refs #114)Remove unnecessary database accessing. 2013-11-03 14:51:42 +09:00
takezoe
a03acc68e7 (refs #114)Disable link for disabled users. 2013-11-03 14:32:03 +09:00
takezoe
05296473d3 (refs #114)Bug fix 2013-11-03 04:53:41 +09:00
takezoe
2118f8c764 (refs #114)Add group deletion. 2013-11-03 01:37:23 +09:00
takezoe
e366af98b5 (refs #114)Add TODO to helpers#activityMessage() 2013-11-02 14:10:05 +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
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
takezoe
9c60b69c88 (refs #114)Add logical remove flag to ACCOUNT. 2013-11-01 03:39:59 +09:00
takezoe
4f10bccf84 (refs #114)Add logical remove flag to ACCOUNT. 2013-11-01 03:38:33 +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
Tomofumi Tanaka
7e77c102b0 (refs #179) Merge branch 'improve-pullreq-performance' 2013-10-31 22:15:47 +09:00
takezoe
a452c582ab Fix compilation error. 2013-10-31 03:08:28 +09:00
takezoe
0d3adb074d Release ObjectInserter after adding commit. 2013-10-31 02:18:48 +09:00
takezoe
8ec4b52dda (refs #167)Add pusher info to WebHook 2013-10-31 02:07:54 +09:00
Tomofumi Tanaka
9265c68383 (refs #179) Refactor 2013-10-31 01:38:29 +09:00
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