* stable-2.12:
EmailMerge: provide user when available
Set version to 2.11.7
Release notes for Gerrit 2.11.7
Document new allowrcpt restriction on adding user email
OutputStreamQuery: fix comments with current-patch-set option
Add tests for ssh query command
EqualsFilePredicate: Make it work in project watches
commit-msg: respect commentChar from git-config
EmailReviewComments: Provide the current user instead of exception
Remove index defaultMaxClauseCount config setting while reusing maxTerms
OutputStreamQuery: Take files into account when adding patch sets
Update 2.12 release notes with fixes from stable-2.11
Update 2.11.6 release notes
OutgoingEmail: Fix breakage introduced in add() method
ChangeData: Throw exception when failing to reload change
SuggestReviewersIT: Test for case-preserved reviewer suggestion
Return case-preserving email when suggesting reviewers
ReceiveCommits: Improve error message when failing to insert patch set
OutgoingEmail: Kill "Skipping delivery of email" logspam
OutgoingEmail: Check for valid email address when adding recipients
ldap.Helper: Kill "assuming empty group membership" logspam
SmtpEmailSender: Refactor open method and improve logging
CreateEmail: Don't allow to add email prohibited by sendemail.allowrcpt
RegisterNewEmailSender: Don't unconditionally send verification mail
Set version to 2.11.6
Release notes for Gerrit 2.11.6
Don't reload plugins every minute
Update documentation of commentlink to reflect changed URL
Fix display of active row marker in tag list
Update replication plugin to latest revision
Fix tcl syntax highlighting not working
Fix index.maxTerms documented default from 500 to no limit
Update replication plugin to latest revision
Update replication plugin to latest revision
XSRF token cookie should honor auth.cookieSecure setting
Fix pushing a first patchset does not trigger replication
Fix merge validator exception type is ignored
Send email using email queue instead of the default queue
Rename EmailReviewCommentsExecutor to SendEmailExecutor
Expose IndexCollection in plugin guice injector
Update replication plugin to latest revision
Remove documentation of --type option from ls-groups command
ReceiveCommits: Log error message when failing to insert patch set
ReceiveCommits: Remove declaration of unthrown exception
Schema_113: Fix push certificate column type
Update replication plugin to latest version
Return case-preserving email when suggesting reviewers
ChangeEditUtil: Fix inconsistent change message
Fix serving of documentation in application container
Update replication plugin to latest revision
Use merge strategy for mergeability testing on "Rebase if Necessary" strategy
The changes done in Id1de81b31 ("Fix merge validator exception type is
ignored") are not compatible with the master branch and are reverted
in this merge.
This reverts commit dd41c53bd72b363f3f35f9a8e0dc5238c35d1b8b.
Change-Id: I821a40bbfe77832c0bd2342ab22d37433a683799
557ec3c776