Merge branch 'feature/new-branches-ui' of https://github.com/team-lab/gitbucket into team-lab-feature/new-branches-ui ...

Conflicts:
	src/main/scala/service/PullRequestService.scala

Merge branch 'master' into new-plugin-system ...

Conflicts:
	src/main/scala/servlet/AutoUpdateListener.scala

Merge pull request #605 from rlazoti/add-connection-pool ...

Add Connection Pool

Use util.Version for GitBucket migration

Add migration system for plugins

Add prototype of global action support

update pullrequest commitId on file edited by online editor

add action link to pull request.

new branches ui like GitHub.

add connection pool to Database object

code alignment. We want a pretty pull request!

Introducing "Enable SSL" option on LDAP settings

Fix a few issues detected by static analysis

(refs #578)Add migration for repositories which have removed parent or origin repository.

(refs #564)Change the attached files directory to /commens from /issues

(refs #394)Create branch from Web UI

Release TreeWalk in recuresive function.

Like GitHub, show a shortcut path of the directory whoes ancestors have only one child directory.

(refs #434)Refactor to get last modified commit

(refs #457)Fix the target of updateRef

(refs#458)Correct short and full message ...

Swaped short and full message in commit info by accident.

Merge branch 'scala-2.11'

(refs #374) Fix compile error.

Merge branch 'show-author'

(refs #437)Fix typo ...

Threre is more good function name, but i have no idea 

(refs #437)Show author at repo file list view

(refs #437)Show author instead of committer ...

* Explicit classify committer and author
* Use author to render avatar image html
* Support commit view

Improved model package. The details are as follows: ...

* Fix the Profiles class from package object to simple object
* Fix the row case class to model package
* Define the alias of JdbcBackend#Session

(refs #445)Fix yen to backslash

(refs #445)Keep line separator in online file editing

Fix TODO.

Change LDAPUtil method name

AccountUtil is merged to LDAPUtil

Merge branch 'add-features-to-ldapauth' of https://github.com/yjkony/gitbucket into yjkony-add-features-to-ldapauth ...

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/scala/util/LDAPUtil.scala
	src/main/scala/util/Notifier.scala

Merge branch 'master' into slick2 ...

Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala

Fix CRLF to LF

(refs #341)Fix compilation error other than date mapping and delete statement

Merge branch 'plugin-system'

(refs #341) Implement a method to get the session.

specify LDAP search filter explicitly

Merge branch 'master' into plugin-system ...

Conflicts:
	src/main/scala/servlet/AutoUpdateListener.scala

(refs #310)Convert all CRLF to LF

(refs #341) Migrate slick session.

(refs #408)Performance improvement for index page.

(refs #32)Add plugin install tab

(refs #32)Add plugin system initialization

Merge commit Tag 2.0 'db5395d' into add-features-to-ldapauth ...

Conflicts:
	src/main/twirl/account/edit.scala.html

Small cleanup using static analysis

(refs #375)Show merge commit diffs correctly

Migrate: add extension to files which are attached to issue

Add link for image file ...

* Render image tag with link tag on issue and wiki
* Correct response content-type of attached image on issue

Merge commit Tag 1.13 ('3e82534') into add-features-to-ldapauth ...

Conflicts:
	src/main/scala/service/AccountService.scala
	src/main/scala/util/LDAPUtil.scala

(refs #324)Update commitIdFrom when pullrequest branch is updated

Merge branch 'fileupload'

(refs #13)File editing (add, edit and delete) in repository viewer is available.

Refactoring

(refs #13)Commit from AceEditor is available.

Removed FileUploadControllerBase(in the middle of improving file ...

upload).

Merge remote-tracking branch 'origin/master'

Fix message for empty repository

Fix getAllcommitIds bug in empty repository

(refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table

(refs #335)Oops, fix substring condition

(refs #335)Use string before '@' of mail address if user name is mail address in LDAP authentication.

Merge commit '5317ac5' (tag 1.12) into add-features-to-ldapauth

Display the first line of commit message on the file list

Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty".

Merge branch 'master' into add-features-to-ldapauth

(refs #303)Submodule support

(refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2

(refs #241)Allow group manager to use repository settings

Revert unnecessary format changes.

(refs #241)Work for specifying group manager

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

(refs #198)Allow group editing by group members.

Merge branch 'odz-closing-issues-via-commit-messages'

(refs #218)Separate StringUtil#extractCloseId() to add unit test.

Fix to use Exception#ignoring to ignore Exception.

(refs #280)Commit count limitation is changed to 10000 from 1000.

Apply scala.util.control.Exception to exception handling.

Add features (additional filter condition / disable mail resolve) to LDAP authentication.

(refs #60)Mentioned issue reference from other issue or issue comment.

(refs #251)Remove BOM from UTF-8 string.

(refs #245)Add full name attribute for LDAP authentication.

Use old home if it exists.

Use FileUtils#moveDirectory() instead of File#renameTo()

Update data directory checking condition.

(refs #244)Change the default data directory to HOME/.gitbucket

Remove some functions from ControlUtil.

Silenced compiler warnings

(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

Merge pull request #190 from jtyr/master ...

Adding LDAP StartTLS support

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.

Moving keystore definition into settings

(refs #181) Fixed bug in charset.

Upgrade to scalatra-forms 0.0.4

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

(refs #179) Merge branch 'improve-pullreq-performance'

Release ObjectInserter after adding commit.

Merge remote-tracking branch 'master' into improve-pullreq-performance

Improve repository creation to not use the working repository.

(refs #180)Remove Directory#getWikiWorkDir()

Improve checkConflict ...

* Delete temporary RefSpec after checkConflict
* mergeguide use checkconflictInPullRequest instead of checkconflict

(refs #104)Zip file is exported from the bare repository directly.

Fix bug.

(refs #163)Remove escaping for '.'

Fix bug.

(refs #163)Fixed

(refs #163)Allow '.' in user name.

Merge branch 'master' into #33_match-by-email ...

Conflicts:
	src/main/scala/view/helpers.scala

avoid NumberFormatException

add FileUtil.withTmpDir

(refs #142)Fix NoSuchElementException for empty repository.

(refs #99) Improved to configure the FROM field of the email.

(refs #139) Add info log for debugging LDAP Auth

Add FileUtil#getContentType().

(refs #105)Specify suitable Content-Type header for downloaded file.

(refs #100) Fix bug that can't get ServletContext in the future block.

Bug fix caused by path splitting.

Define request attribute keys.

Define session keys.

Improve session handling.

Use ControlUtil.

Add RichRequest which extends HttpServletRequest.

Use ControlUtil.

Use ControlUtil#using() to handle RevWalk.

Use ControlUtil.

Add ControlUtil.

Introduce ControlUtil which provides control facilities such as using() or defining().

Fix typo.

(refs #10) Except group account in notification.

Make configurable data(git,db) dir using env vars

(refs #10) Add notification. Notification of when merging is not ...

implemented yet.

(refs #10) Completed notification implementation.

Merge pull request #86 from odz/chardet ...

Add encoding detection

bindDN and bindPassword became optional for OpenLDAP.

Fix LDAPUtil#findUser() for OpenLDAP.

Add encoding detection

(refs #10) Creates a E-mail sending. still working on...

Scalized :-)

LDAP authentication by using bind account

(refs #78)LDAP port is optional.

(refs #78)Implementing LDAP authentication.

(refs #76)Show the content of the previous commit for removed files.

Remove unused import statements.

Upgrade scalatra-forms.

Merge branch 'master' into fork-and-pullreq ...

Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
	src/main/scala/service/RepositoryService.scala

(fix #58) Fix bug that failed to view tag tree

Make more fast and github-like repository viewer

Merge branch 'master' into fork-and-pullreq ...

Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/util/JGitUtil.scala

Add lock for repository operation.

(refs #2)Fix pull request. Basic pattern had been tested but it's still unstable.

(refs #50)Fix search logic in empty repository

Merge branch 'master' into fork-and-pullreq ...

Conflicts:
	src/main/resources/update/1_3.sql
	src/main/resources/update/1_4.sql
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/twirl/account/repositories.scala.html

Merge branch '#3_repository-search' ...

Conflicts:
	src/main/scala/app/UserManagementController.scala
	src/main/scala/service/IssuesService.scala
	src/main/twirl/issues/issue.scala.html

Move FileUploadUtil to FileUploadControllerBase.

Move Implicit && to model package object.

Merge branch 'master' into #3_repository-search

Merge branch 'master' into #33_match-by-email ...

Conflicts:
	src/main/scala/util/JGitUtil.scala
	src/main/scala/view/helpers.scala
	src/main/twirl/repo/blob.scala.html
	src/main/twirl/repo/commit.scala.html
	src/main/twirl/repo/commits.scala.html
	src/main/twirl/repo/files.scala.html

Use Gravatar if committer is not registered in GitBucket.

Bugfix

(refs #3)Cleanup

Remove unused import statement.

Fix typo.

(refs #3)Search by AND if query words are separated by whitespace.

Bugfix

(refs #2)Fix comparing diffs before sending pull request.

Remove var!

(refs #2)Implementing the comparing view.

Merge branch 'master' into fork-and-pullreq ...

Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/util/JGitUtil.scala

(refs #34)Link conversion checks existence of accounts and issues.

(refs #33)Match committer by mail address.

(refs #35)Fixed.

(refs #36)Handle unresolved revision string.

Replace String#format() with string interpolation.

Improve Git repository creation.

(refs #2)Experimental implementation of forking repository.

Rename StringUtil#encrypt() to sha1().

Replace implicit conversion with implicit class.

(refs #28)Look up Gravatar if user icon is not configured.

(refs #28)Fix information message.

(refs #28)Avatar image can be uploaded at the account editing page.

(refs #28)Implementing avatar image uploading.

(refs #31)Make it possible to create empty repository.

Display the commit count at the repository viewer.

Authenticators are renamed.

Fix OneselfAuthenticator.

Add OneselfAuthenticator.

Fix OwnerOnlyAuthenticator

Authenticator pass RepositoryInfo to actions.

Authenticator pass RepositoryInfo to actions.

Fix retrieving user name and repository name from request path in Authenticator.

Fix some Ajax URLs and Authenticators.

Add TODO.

Move extendsHtmlSeq which provides mkHtml to view.helpers because it's used at only views.

Encrypt password.

CompressUtil and FileTypeUtil are merged to FileUtil.

Add System Settings page.

Add validation for label name and color.

Implementing conditional issue searching.

Separate extension of scalatra-forms to trait from ControllerBase.

Fix typo in Scaladoc.

Move implicit conversion for mkHtml to util.Implicits.

Fix commit message presentation.

Convert issue id and commit id in commit message to link.

Update flag columns to BOOLEAN.

Move getBranchesOfCommit and getTagsOfCommit to JGitUtil.

Show diff for only text files.

Improve performance of the commit history page.

Delete all temporary directories in repository deletion.

Display parent commit id at the commit details page.

Fix image files presentation at blob view and diff view.

Fix commit log presentation.

Fix commit log.

reverse the order of commits to retrieve the last commit of files.

Improve repository presentation.

Fix the repository url.

Close the object database at exit on JGitUtil#getContent().

Fix an error in ReadableRepositoryAuthenticator when repository does not exist.

Remove unused import statement.

Improve performance of the file list.

BufFix for the repository viewer.

Fix file list of the nested directory.

Fix error response.

Add authentication.

Separate Authenticators to the trait from ControllerBase.

Move case classes in RepositoryViewerController to JGitUtil.

Improve the commit hook to add commit messages to the issue comment.

Servlet, Filter and Listener are moved to 'servlet' package from 'util' ...

package.

WikiUtil moved to WikiService and applied cake pattern to ...

WikiController.

Add TransactionFilter.

Add JGitUtil#withGit() and use it to release repository resources ...

certainly.

Implemented: Downloading tagged contents as zip file.

Deletion of wiki page is implemented.

Replace existing code with JGitUtil#getRevCommitFromId().

Fixed tags page.

Added compare revisions for Wiki changes.

Wiki repositories should be not displayed in the repository list.

wiki repository name is changed from xxx-wiki.git to xxx.wiki.git.

Add file history page to the repository viewer.

Added limit parameter to JGit.getCommitLogs() and page parameter became ...

optional.

Don't save if page is not modified.

Add wiki pages.

New wiki page creation works.

Page editing works.

Fixed Scaladoc mistake.

Implementing Wiki part.

Removed unused import statement.

Move GitRepositoryServlet and BasicAuthenticationFilter to util package.

Start to implement WikiController. ...

Changed controllers from servlet to filter by mapping flexibility.

Start to implement Wiki.

Unify JGitUtil interface to take Git instead of Repository or ...

combination of the owner and the repository name.

Get all data from the bare repository. ...

Cloned repositories in backend is not necessary at last.

getCommitLog is moved to JGitUtil and it get commit logs from only bared ...

repository.

Add Scaladoc.

Separate complex JGit operation to JGitUtil from ...

RepositoryViewerServlet.

Add debug log.

Specify character encoding for file I/O.

Fixed typo of the SQL file name.

Fixed error handling.

Add logs.

Add Scaladoc.

Test of automatic schema update.

Start to implement database migration.

Separate scalatra-forms from gitbucket.

Cloned repositories for internal use are updated after push.

Add RepositoryHome to point GitBucketHome/repositories.

Fixed error when GitBucketHome/repositories does not exist.

Improvements for validation.

Add basic ValueTypes and Constrains.

Added TODO for Validations.

Nested property is supported in the mapping definition.

Validation Framework completed mostly.

Added Scaladoc.

Uses HOME/gitbucket as GitBucketHome.

Git repository creation works now!

Initial Import.