From a10188260cb0ff1371f2d4796eda80093d29e14d Mon Sep 17 00:00:00 2001 From: Mike Slinn Date: Fri, 3 Oct 2014 15:26:42 -0700 Subject: [PATCH 01/22] Update README.md --- contrib/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/README.md b/contrib/README.md index 1121a224a..716ef77fe 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -8,6 +8,6 @@ Common scripts are in this directory. This version of scripts has so far only been tested on Ubuntu and Mac. Someone else will have to test on RedHat. To run: -1. Edit `gitbucket.conf` to suit. -2. Type: `install` + 1. Edit `gitbucket.conf` to suit. + 2. Type: `install` From 054ae75b6b78660413f33b67b87755adaec71722 Mon Sep 17 00:00:00 2001 From: Rodrigo Lazoti Date: Fri, 7 Nov 2014 10:55:08 -0200 Subject: [PATCH 02/22] Add repository's link to issues and pull request list on dashboard --- src/main/twirl/dashboard/issueslist.scala.html | 2 +- src/main/twirl/dashboard/pullslist.scala.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/twirl/dashboard/issueslist.scala.html b/src/main/twirl/dashboard/issueslist.scala.html index 79c55177a..d0f7cd103 100644 --- a/src/main/twirl/dashboard/issueslist.scala.html +++ b/src/main/twirl/dashboard/issueslist.scala.html @@ -27,7 +27,7 @@ } else { } - @issue.repositoryName ･ + @issue.userName/@issue.repositoryName ･ @if(issue.isPullRequest){ @issue.title } else { diff --git a/src/main/twirl/dashboard/pullslist.scala.html b/src/main/twirl/dashboard/pullslist.scala.html index fbddac5ee..4c959554d 100644 --- a/src/main/twirl/dashboard/pullslist.scala.html +++ b/src/main/twirl/dashboard/pullslist.scala.html @@ -23,6 +23,7 @@ + @issue.userName/@issue.repositoryName ･ @issue.title #@issue.issueId
From 55224ddcd88cf5abac9d3cb4b341afae4256e1f0 Mon Sep 17 00:00:00 2001 From: Mike Slinn Date: Sat, 8 Nov 2014 04:07:14 -0800 Subject: [PATCH 03/22] Changed Bootstrap's default color pink for code tags to match github's color --- src/main/webapp/assets/common/css/gitbucket.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index 934080dac..fcf66a737 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -918,6 +918,8 @@ div.markdown-body pre { div.markdown-body code { font-size: 12px; padding: 0 5px; + background-color: rgba(0,0,0,0.04); + rgb(51, 51, 51); } div.markdown-body table { From cbfb863a544e029d0b00ba9c5f0afcf269bf06bb Mon Sep 17 00:00:00 2001 From: nazoking Date: Mon, 29 Dec 2014 19:56:52 +0900 Subject: [PATCH 04/22] Add information message to singin view. --- src/main/twirl/signin.scala.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/twirl/signin.scala.html b/src/main/twirl/signin.scala.html index c7eec08da..54163718d 100644 --- a/src/main/twirl/signin.scala.html +++ b/src/main/twirl/signin.scala.html @@ -2,6 +2,12 @@ @import context._ @main("Sign in"){ } From f7fd53bf095fcd1c026ecd004d0da4f567f8299a Mon Sep 17 00:00:00 2001 From: nazoking Date: Mon, 29 Dec 2014 20:54:22 +0900 Subject: [PATCH 05/22] add information to singup view --- src/main/twirl/account/register.scala.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/twirl/account/register.scala.html b/src/main/twirl/account/register.scala.html index 3883f5023..96a5c357f 100644 --- a/src/main/twirl/account/register.scala.html +++ b/src/main/twirl/account/register.scala.html @@ -3,10 +3,11 @@ @import view.helpers._ @html.main("Create your account"){
+

Create your account

-
+
@@ -35,7 +36,7 @@
-
+
@helper.html.uploadavatar(None) @@ -46,5 +47,15 @@
+
+
+ @settings.information.map { information => +
+ + @Html(information) +
+ } +
+
} From 7f142d2c0dfbbcabee028da5ed7b7226899b3577 Mon Sep 17 00:00:00 2001 From: Mario Enrico Ragucci Date: Wed, 7 Jan 2015 07:41:41 +0100 Subject: [PATCH 06/22] Introducing "Enable SSL" option on LDAP settings --- src/main/scala/app/SystemSettingsController.scala | 1 + src/main/scala/service/SystemSettingsService.scala | 4 ++++ src/main/scala/util/LDAPUtil.scala | 12 ++++++++++-- src/main/twirl/admin/system.scala.html | 7 +++++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala index f323347d1..c5fcb0fcb 100644 --- a/src/main/scala/app/SystemSettingsController.scala +++ b/src/main/scala/app/SystemSettingsController.scala @@ -41,6 +41,7 @@ trait SystemSettingsControllerBase extends ControllerBase { "fullNameAttribute" -> trim(label("Full name attribute", optional(text()))), "mailAttribute" -> trim(label("Mail address attribute", optional(text()))), "tls" -> trim(label("Enable TLS", optional(boolean()))), + "ssl" -> trim(label("Enable SSL", optional(boolean()))), "keystore" -> trim(label("Keystore", optional(text()))) )(Ldap.apply)) )(SystemSettings.apply).verifying { settings => diff --git a/src/main/scala/service/SystemSettingsService.scala b/src/main/scala/service/SystemSettingsService.scala index 14bc5315b..d0d536d15 100644 --- a/src/main/scala/service/SystemSettingsService.scala +++ b/src/main/scala/service/SystemSettingsService.scala @@ -42,6 +42,7 @@ trait SystemSettingsService { ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x)) ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x)) ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString)) + ldap.ssl.foreach(x => props.setProperty(LdapSsl, x.toString)) ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x)) } } @@ -92,6 +93,7 @@ trait SystemSettingsService { getOptionValue(props, LdapFullNameAttribute, None), getOptionValue(props, LdapMailAddressAttribute, None), getOptionValue[Boolean](props, LdapTls, None), + getOptionValue[Boolean](props, LdapSsl, None), getOptionValue(props, LdapKeystore, None))) } else { None @@ -134,6 +136,7 @@ object SystemSettingsService { fullNameAttribute: Option[String], mailAttribute: Option[String], tls: Option[Boolean], + ssl: Option[Boolean], keystore: Option[String]) case class Smtp( @@ -174,6 +177,7 @@ object SystemSettingsService { private val LdapFullNameAttribute = "ldap.fullname_attribute" private val LdapMailAddressAttribute = "ldap.mail_attribute" private val LdapTls = "ldap.tls" + private val LdapSsl = "ldap.ssl" private val LdapKeystore = "ldap.keystore" private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = diff --git a/src/main/scala/util/LDAPUtil.scala b/src/main/scala/util/LDAPUtil.scala index ae578bd9b..66cb5e2f1 100644 --- a/src/main/scala/util/LDAPUtil.scala +++ b/src/main/scala/util/LDAPUtil.scala @@ -48,6 +48,7 @@ object LDAPUtil { dn = ldapSettings.bindDN.getOrElse(""), password = ldapSettings.bindPassword.getOrElse(""), tls = ldapSettings.tls.getOrElse(false), + ssl = ldapSettings.ssl.getOrElse(false), keystore = ldapSettings.keystore.getOrElse(""), error = "System LDAP authentication failed." ){ conn => @@ -65,6 +66,7 @@ object LDAPUtil { dn = userDN, password = password, tls = ldapSettings.tls.getOrElse(false), + ssl = ldapSettings.ssl.getOrElse(false), keystore = ldapSettings.keystore.getOrElse(""), error = "User LDAP Authentication Failed." ){ conn => @@ -96,7 +98,7 @@ object LDAPUtil { }).replaceAll("[^a-zA-Z0-9\\-_.]", "").replaceAll("^[_\\-]", "") } - private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String) + private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, ssl: Boolean, keystore: String, error: String) (f: LDAPConnection => Either[String, A]): Either[String, A] = { if (tls) { // Dynamically set Sun as the security provider @@ -109,7 +111,13 @@ object LDAPUtil { } } - val conn: LDAPConnection = new LDAPConnection(new LDAPJSSEStartTLSFactory()) + val conn: LDAPConnection = + if(ssl) { + new LDAPConnection(new LDAPJSSESecureSocketFactory()) + }else { + new LDAPConnection(new LDAPJSSEStartTLSFactory()) + } + try { // Connect to the server conn.connect(host, port) diff --git a/src/main/twirl/admin/system.scala.html b/src/main/twirl/admin/system.scala.html index 9379672ef..1d0674503 100644 --- a/src/main/twirl/admin/system.scala.html +++ b/src/main/twirl/admin/system.scala.html @@ -169,6 +169,13 @@
+
+
+ +
+
From 858373c6285b84165400d31914fae7ad41450fd0 Mon Sep 17 00:00:00 2001 From: Mario Enrico Ragucci Date: Wed, 7 Jan 2015 07:45:18 +0100 Subject: [PATCH 07/22] small beautifying change to have code properly aligned --- src/main/scala/app/SystemSettingsController.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/app/SystemSettingsController.scala b/src/main/scala/app/SystemSettingsController.scala index c5fcb0fcb..bdcb0a56e 100644 --- a/src/main/scala/app/SystemSettingsController.scala +++ b/src/main/scala/app/SystemSettingsController.scala @@ -41,7 +41,7 @@ trait SystemSettingsControllerBase extends ControllerBase { "fullNameAttribute" -> trim(label("Full name attribute", optional(text()))), "mailAttribute" -> trim(label("Mail address attribute", optional(text()))), "tls" -> trim(label("Enable TLS", optional(boolean()))), - "ssl" -> trim(label("Enable SSL", optional(boolean()))), + "ssl" -> trim(label("Enable SSL", optional(boolean()))), "keystore" -> trim(label("Keystore", optional(text()))) )(Ldap.apply)) )(SystemSettings.apply).verifying { settings => From 31e8e5a95149fee1aab019d83b6388109ac13cdc Mon Sep 17 00:00:00 2001 From: Mario Enrico Ragucci Date: Wed, 7 Jan 2015 07:46:59 +0100 Subject: [PATCH 08/22] code alignment. We want a pretty pull request! --- src/main/scala/util/LDAPUtil.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/scala/util/LDAPUtil.scala b/src/main/scala/util/LDAPUtil.scala index 66cb5e2f1..c8d741f83 100644 --- a/src/main/scala/util/LDAPUtil.scala +++ b/src/main/scala/util/LDAPUtil.scala @@ -48,7 +48,7 @@ object LDAPUtil { dn = ldapSettings.bindDN.getOrElse(""), password = ldapSettings.bindPassword.getOrElse(""), tls = ldapSettings.tls.getOrElse(false), - ssl = ldapSettings.ssl.getOrElse(false), + ssl = ldapSettings.ssl.getOrElse(false), keystore = ldapSettings.keystore.getOrElse(""), error = "System LDAP authentication failed." ){ conn => @@ -66,7 +66,7 @@ object LDAPUtil { dn = userDN, password = password, tls = ldapSettings.tls.getOrElse(false), - ssl = ldapSettings.ssl.getOrElse(false), + ssl = ldapSettings.ssl.getOrElse(false), keystore = ldapSettings.keystore.getOrElse(""), error = "User LDAP Authentication Failed." ){ conn => From 485d502bd39184758bba2c43aaadbdc34c16bc1b Mon Sep 17 00:00:00 2001 From: Shintaro Murakami Date: Fri, 9 Jan 2015 00:16:09 +0900 Subject: [PATCH 09/22] (refs #584) Refactored --- .../scala/app/RepositoryViewerController.scala | 16 ++++++++-------- src/main/twirl/helper/diff.scala.html | 2 +- src/main/twirl/repo/commentform.scala.html | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/scala/app/RepositoryViewerController.scala b/src/main/scala/app/RepositoryViewerController.scala index 69e02eada..477b90596 100644 --- a/src/main/scala/app/RepositoryViewerController.scala +++ b/src/main/scala/app/RepositoryViewerController.scala @@ -248,10 +248,10 @@ trait RepositoryViewerControllerBase extends ControllerBase { val id = params("id") createCommitComment(repository.owner, repository.name, id, context.loginAccount.get.userName, form.content, form.fileName, form.oldLineNumber, form.newLineNumber, form.issueId.isDefined) - if (form.issueId.isDefined) - recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, form.issueId.get, form.content) - else - recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content) + form.issueId match { + case Some(issueId) => recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content) + case None => recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content) + } redirect(s"/${repository.owner}/${repository.name}/commit/${id}") }) @@ -273,10 +273,10 @@ trait RepositoryViewerControllerBase extends ControllerBase { val id = params("id") val commentId = createCommitComment(repository.owner, repository.name, id, context.loginAccount.get.userName, form.content, form.fileName, form.oldLineNumber, form.newLineNumber, form.issueId.isDefined) - if (form.issueId.isDefined) - recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, form.issueId.get, form.content) - else - recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content) + form.issueId match { + case Some(issueId) => recordCommentPullRequestActivity(repository.owner, repository.name, context.loginAccount.get.userName, issueId, form.content) + case None => recordCommentCommitActivity(repository.owner, repository.name, context.loginAccount.get.userName, id, form.content) + } helper.html.commitcomment(getCommitComment(repository.owner, repository.name, commentId.toString).get, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository) }) diff --git a/src/main/twirl/helper/diff.scala.html b/src/main/twirl/helper/diff.scala.html index 3554cb698..23c547470 100644 --- a/src/main/twirl/helper/diff.scala.html +++ b/src/main/twirl/helper/diff.scala.html @@ -199,7 +199,7 @@ $(function(){ var commitId = $this.closest('.table-bordered').attr('commitId'), fileName = $this.closest('.table-bordered').attr('fileName'), oldLineNumber, newLineNumber = $this.closest('.newline').clone().children().remove().end().text(), - url = '@url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName @if(issueId.isDefined){+ '&issueId=@issueId.get'}; + url = '@url(repository)/commit/' + commitId + '/comment/_form?fileName=' + fileName@issueId.map { id => + '&issueId=@id' }; if (viewType == 0) { oldLineNumber = $this.closest('.oldline').clone().children().remove().end().text(); } else { diff --git a/src/main/twirl/repo/commentform.scala.html b/src/main/twirl/repo/commentform.scala.html index dd1f715e9..36ad52ccd 100644 --- a/src/main/twirl/repo/commentform.scala.html +++ b/src/main/twirl/repo/commentform.scala.html @@ -29,10 +29,10 @@
} - @if(issueId.isDefined){} - @if(fileName.isDefined){} - @if(oldLineNumber.isDefined){} - @if(newLineNumber.isDefined){} + @issueId.map { issueId => } + @fileName.map { fileName => } + @oldLineNumber.map { oldLineNumber => } + @newLineNumber.map { newLineNumber => }