gerrit/gerrit_site/etc/GerritSite.css | 21 -------- gerrit/gerrit_site/etc/GerritSiteFooter.html | 4 - gerrit/gerrit_site/etc/GerritSiteHeader.html | 3 - gerrit/gerrit_site/etc/gerrit.config | 59 ---------------------- gerrit/gerrit_site/etc/mail/Abandoned.vm | 44 ---------------- gerrit/gerrit_site/etc/mail/ChangeFooter.vm | 52 ------------------- gerrit/gerrit_site/etc/mail/ChangeSubject.vm | 37 -------------- gerrit/gerrit_site/etc/mail/Comment.vm | 53 -------------------- gerrit/gerrit_site/etc/mail/MergeFail.vm | 44 ---------------- gerrit/gerrit_site/etc/mail/Merged.vm | 44 ---------------- gerrit/gerrit_site/etc/mail/NewChange.vm | 63 ------------------------ gerrit/gerrit_site/etc/mail/RegisterNewEmail.vm | 49 ------------------ gerrit/gerrit_site/etc/mail/ReplacePatchSet.vm | 54 -------------------- 13 files changed, 527 deletions(-)
New commits: commit 404ca62a0e0c2e625f9505b91a23c62b4065457e Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Fri Apr 12 13:11:20 2019 +0200 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed Apr 17 22:01:54 2019 +0200 Remove obsolete gerrit/gerrit_site/etc/ tree for the configuration of the gerrit.libreoffice.org instance, it has apparently been supserseded by <https://gerrit.libreoffice.org/#/admin/projects/gerrit-etc> Change-Id: I38501ef8a0697027f736393a53f0bf9e89528262 Reviewed-on: https://gerrit.libreoffice.org/70656 Reviewed-by: Stephan Bergmann <sberg...@redhat.com> Tested-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/gerrit/gerrit_site/etc/GerritSite.css b/gerrit/gerrit_site/etc/GerritSite.css deleted file mode 100644 index 4525d33..0000000 --- a/gerrit/gerrit_site/etc/GerritSite.css +++ /dev/null @@ -1,21 +0,0 @@ -#gerrit_header {background-color: #ffffff; display:inline; position:absolute; top:-10px; margin-left:40%;margin-right:60%; width:400px}; -#gerrit_header h3 {font-family: 'PT Sans', sans-serif; font-weight: normal; letter-spacing: -1px} -#gerrit_header h2 {font-family: 'PT Sans', sans-serif; font-weight: normal; letter-spacing: -1px} -#gerrit_header h1 {font-family: 'PT Sans', sans-serif; font-weight: normal; letter-spacing: -1px} - - -#gerrit_topmenu {background-color:#ffffff;} - -#gerrit_topmenu tbody tr td table.gwt-TabBar {color: #353535; border-bottom: 1px solid #C5E2EA;} - - - -#gerrit_topmenu tbody tr td table {border: 0; color:#FCFEEF; border-bottom: 1px solid #C5E2EA;} -#gerrit_topmenu tbody tr td table.gwt-TabPanelBottom {color: #353535; border-bottom: 1px solid #C5E2EA;} - - -#gerrit_topmenu tbody tr td table.gwt-TabBar {color: #353535; border-bottom: 1px solid #C5E2EA;} -#gerrit_topmenu .gwt-Button {padding: 3px 6px} -#gerrit_topmenu .gwt-TextBox {width: 250px} - - diff --git a/gerrit/gerrit_site/etc/GerritSiteFooter.html b/gerrit/gerrit_site/etc/GerritSiteFooter.html deleted file mode 100644 index 87cf722..0000000 --- a/gerrit/gerrit_site/etc/GerritSiteFooter.html +++ /dev/null @@ -1,4 +0,0 @@ -<div style="color: #18A303;margin-left: 1cm;font-weight: bold;"> -If you need help with your patch or want to discuss it, do not hesitate to join <a href="irc://chat.freenode.net/libreoffice-dev">#libreoffice-dev on freenode IRC</a><br/> -If you need help with gerrit itself, please send a email to <a href="mailto:ger...@otrs.documentfoundation.org">ger...@otrs.documentfoundation.org</a> -</div> diff --git a/gerrit/gerrit_site/etc/GerritSiteHeader.html b/gerrit/gerrit_site/etc/GerritSiteHeader.html deleted file mode 100644 index 6718d51..0000000 --- a/gerrit/gerrit_site/etc/GerritSiteHeader.html +++ /dev/null @@ -1,3 +0,0 @@ -<div> - <h3 style="color: #18A303;"><img src="/static/title.png" style="vertical-align:-40%;"/>Code Review</h3> -</div> diff --git a/gerrit/gerrit_site/etc/gerrit.config b/gerrit/gerrit_site/etc/gerrit.config deleted file mode 100644 index 86339d1..0000000 --- a/gerrit/gerrit_site/etc/gerrit.config +++ /dev/null @@ -1,59 +0,0 @@ -[gerrit] - basePath = /home/gerrit2/projects/foo.git - canonicalWebUrl = http://idaia.de:8080/ -[database] - type = MYSQL - hostname = localhost - database = reviewdb - username = gerrit2 -[auth] - type = OPENID -[sendemail] - smtpServer = mail.example.com - smtpUser = joe....@example.de - includeDiff = true - maximumDiffSize = 131072 -[container] - user = gerrit2 - javaHome = /usr/lib/jvm/java-6-sun-1.6.0.20/jre -[sshd] - listenAddress = idaia.de:29418 -[httpd] - listenUrl = http://idaia.de:8080/ -[cache] - directory = cache - -[theme] - backgroundColor = ffffff - topMenuColor = ffffff - textColor = 000000 - trimColor = eef3f5 - selectionColor = d1e6ea - changeTableOutdatedColor = f5cccc - tableOddRowColor = ffffff - tableEvenRowColor = f5f5ff - -[gitweb] - revision = "?p=${project}.git;a=commitdiff;h=${commit}" - -[commentlink "freedesktop"] - match = "(BUG|Bug|bug|BUGZILLA|Bugzilla|bugzilla|BZ|Bz|bz|TICKET|Ticket|ticket|ISSUE|fdo|FDO):?#?(\\d+)" - link = https://bugs.libreoffice.org/show_bug.cgi?id=$2 - -[commentlink "redhat"] - match = "(rhbz|RHBZ):?#?(\\d+)" - link = https://bugzilla.redhat.com/show_bug.cgi?id=$2 - -[commentlink "novell"] - match = "(bnc|BNC|n|N):?#?(\\d+)" - link = https://bugzilla.novell.com/show_bug.cgi?id=$2 - -[commentlink "apache"] - match = "(issue|Issue|i):?#?(\\d+)" - link = https://issues.apache.org/ooo/show_bug.cgi?id=$2 - -[commentlink "launchpad"] - match = "(lp|LP):?#?(\\d+)" - link = https://launchpad.net/bugs/$2 - - diff --git a/gerrit/gerrit_site/etc/mail/Abandoned.vm b/gerrit/gerrit_site/etc/mail/Abandoned.vm deleted file mode 100644 index 57f4f63..0000000 --- a/gerrit/gerrit_site/etc/mail/Abandoned.vm +++ /dev/null @@ -1,44 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The Abandoned.vm template will determine the contents of the email related -## to a change being abandoned. It is a ChangeEmail: see ChangeSubject.vm and -## ChangeFooter.vm. -## -$fromName has abandoned this change. - -Change subject: $change.subject -...................................................................... - - -#if ($coverLetter) -$coverLetter - -#end diff --git a/gerrit/gerrit_site/etc/mail/ChangeFooter.vm b/gerrit/gerrit_site/etc/mail/ChangeFooter.vm deleted file mode 100644 index 1eb6842..0000000 --- a/gerrit/gerrit_site/etc/mail/ChangeFooter.vm +++ /dev/null @@ -1,52 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The ChangeFooter.vm template will determine the contents of the footer -## text that will be appended to ALL emails related to changes. -## -#set ($SPACE = " ") ---$SPACE -#if ($email.changeUrl) -To view, visit $email.changeUrl -#set ($notblank = 1) -#end -#if ($email.settingsUrl) -To unsubscribe, visit $email.settingsUrl -#set ($notblank = 1) -#end -#if ($notblank == 1) - -#end -Gerrit-MessageType: $messageClass -Gerrit-Change-Id: $changeId -Gerrit-PatchSet: $patchSet.patchSetId -Gerrit-Project: $projectName -Gerrit-Branch: $branch.shortName -Gerrit-Owner: $email.getNameEmailFor($change.owner) diff --git a/gerrit/gerrit_site/etc/mail/ChangeSubject.vm b/gerrit/gerrit_site/etc/mail/ChangeSubject.vm deleted file mode 100644 index bb3c127..0000000 --- a/gerrit/gerrit_site/etc/mail/ChangeSubject.vm +++ /dev/null @@ -1,37 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The ChangeSubject.vm template will determine the contents of the email -## subject line for ALL emails related to changes. -## -#macro(elipses $length $str) -#if(($str.length()+3) > $length)${str.substring(0,$length)}...#else$str#end -#end -Change in $projectName.replaceAll('/.*/', '...')[$branch.shortName]: #elipses(60, $change.subject) diff --git a/gerrit/gerrit_site/etc/mail/Comment.vm b/gerrit/gerrit_site/etc/mail/Comment.vm deleted file mode 100644 index 9af98a6..0000000 --- a/gerrit/gerrit_site/etc/mail/Comment.vm +++ /dev/null @@ -1,53 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The Comment.vm template will determine the contents of the email related to -## a user submitting comments on changes. It is a ChangeEmail: see -## ChangeSubject.vm and ChangeFooter.vm. -## -#if ($email.coverLetter || $email.inlineComments) -$fromName has posted comments on this change. - -Change subject: $change.subject -...................................................................... - - -#if ($email.coverLetter) -$email.coverLetter - -#end -## -## It is possible to increase the span of the quoted lines by using the line -## count parameter when calling $email.inlineComments as a function. -## -## Example: #if($email.inlineComments)$email.getInlineComments(5)#end -## -#if($email.inlineComments)$email.inlineComments#end -#end diff --git a/gerrit/gerrit_site/etc/mail/MergeFail.vm b/gerrit/gerrit_site/etc/mail/MergeFail.vm deleted file mode 100644 index 6ded252..0000000 --- a/gerrit/gerrit_site/etc/mail/MergeFail.vm +++ /dev/null @@ -1,44 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The MergeFail.vm template will determine the contents of the email related -## to a failure upon attempting to merge a change to the head. It is a -## ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm. -## -$fromName has submitted this change and it FAILED to merge. - -Change subject: $change.subject -...................................................................... - - -#if ($email.coverLetter) -$email.coverLetter - -#end diff --git a/gerrit/gerrit_site/etc/mail/Merged.vm b/gerrit/gerrit_site/etc/mail/Merged.vm deleted file mode 100644 index bcbc7bd..0000000 --- a/gerrit/gerrit_site/etc/mail/Merged.vm +++ /dev/null @@ -1,44 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The Merged.vm template will determine the contents of the email related to -## a change successfully merged to the head. It is a ChangeEmail: see -## ChangeSubject.vm and ChangeFooter.vm. -## -#macro(elipses $length $str) -#if($str.length() > $length)${str.substring(0,$length)}...#else$str#end -#end -$fromName has submitted this change and it was merged. - -Change subject: $change.subject -...................................................................... - - -$email.changeDetail$email.approvals diff --git a/gerrit/gerrit_site/etc/mail/NewChange.vm b/gerrit/gerrit_site/etc/mail/NewChange.vm deleted file mode 100644 index 42f2ca9..0000000 --- a/gerrit/gerrit_site/etc/mail/NewChange.vm +++ /dev/null @@ -1,63 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The NewChange.vm template will determine the contents of the email related -## to a user submitting a new change for review. It is a ChangeEmail: see -## ChangeSubject.vm and ChangeFooter.vm. -## -#if($email.reviewerNames) -Hello $email.joinStrings($email.reviewerNames, ', '), - -I'd like you to do a code review.#if($email.changeUrl) Please visit - - $email.changeUrl - -to review the following change. -#end -#else -$fromName has uploaded a new change for review. -#if($email.changeUrl) - - $email.changeUrl - -#end -#end - -Change subject: $change.subject -...................................................................... - -$email.changeDetail -#if($email.sshHost) - git pull ssh://$email.sshHost/$projectName $patchSet.refName -#end -#if($email.includeDiff) - -$email.UnifiedDiff -#end \ No newline at end of file diff --git a/gerrit/gerrit_site/etc/mail/RegisterNewEmail.vm b/gerrit/gerrit_site/etc/mail/RegisterNewEmail.vm deleted file mode 100644 index 7e095fb..0000000 --- a/gerrit/gerrit_site/etc/mail/RegisterNewEmail.vm +++ /dev/null @@ -1,49 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The RegisterNewEmail.vm template will determine the contents of the email -## related to registering new email accounts. -## -Welcome to Gerrit Code Review at ${email.gerritHost}. - -To add a verified email address to your user account, please -click on the following link#if($email.userNameEmail) while signed in as $email.userNameEmail#end: - -$email.gerritUrl#/VE/$email.emailRegistrationToken - -If you have received this mail in error, you do not need to take any -action to cancel the account. The address will not be activated, and -you will not receive any further emails. - -If clicking the link above does not work, copy and paste the URL in a -new browser window instead. - -This is a send-only email address. Replies to this message will not -be read or answered. diff --git a/gerrit/gerrit_site/etc/mail/ReplacePatchSet.vm b/gerrit/gerrit_site/etc/mail/ReplacePatchSet.vm deleted file mode 100644 index 392df9d..0000000 --- a/gerrit/gerrit_site/etc/mail/ReplacePatchSet.vm +++ /dev/null @@ -1,54 +0,0 @@ -## Copyright (C) 2010 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## -## -## Template Type: -## ------------- -## This is a velocity mail template, see: http://velocity.apache.org and the -## gerrit-docs:config-mail.txt for more info on modifying gerrit mail templates. -## -## Template File Names and extensions: -## ---------------------------------- -## Gerrit will use templates ending in ".vm" but will ignore templates ending -## in ".vm.example". If a .vm template does not exist, the default internal -## gerrit template which is the same as the .vm.example will be used. If you -## want to override the default template, copy the .vm.example file to a .vm -## file and edit it appropriately. -## -## This Template: -## -------------- -## The ReplacePatchSet.vm template will determine the contents of the email -## related to a user submitting a new patchset for a change. It is a -## ChangeEmail: see ChangeSubject.vm and ChangeFooter.vm. -## -#if($email.reviewerNames) -Hello $email.joinStrings($email.reviewerNames, ', '), - -I'd like you to reexamine a change.#if($email.changeUrl) Please visit - - $email.changeUrl - -to look at the new patch set (#$patchSet.patchSetId). -#end -#else -$fromName has uploaded a new patch set (#$patchSet.patchSetId). -#end - -Change subject: $change.subject -...................................................................... - -$email.changeDetail -#if($email.sshHost) - git pull ssh://$email.sshHost/$projectName $patchSet.refName -#end _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits