Merge changes I7599c611,I68895ad4,I6f16a458,I776f5fb9
* changes: Tidy up hooks configuration documentation Fix broken formatting in installCommitMsgHookCommand documentation Document the steps to update the CodeMirror release zip file Update 2.11 release notes
This commit is contained in:
Shawn Pearce
@@ -1515,10 +1515,10 @@ same host as Gerrit.
|
||||
+
|
||||
Optional command to install the `commit-msg` hook. Typically of the
|
||||
form:
|
||||
+
|
||||
----
|
||||
fetch-cmd some://url/to/commit-msg .git/hooks/commit-msg ; chmod +x .git/hooks/commit-msg
|
||||
----
|
||||
|
||||
+
|
||||
By default unset; falls back to using scp from the canonical SSH host,
|
||||
or curl from the canonical HTTP URL for the server. Only necessary if a
|
||||
@@ -1722,41 +1722,61 @@ See also link:config-hooks.html[Hooks].
|
||||
+
|
||||
Optional path to hooks, if not specified then `'$site_path'/hooks` will be used.
|
||||
|
||||
[[hooks.patchsetCreatedHook]]hooks.patchsetCreatedHook::
|
||||
[[hooks.syncHookTimeout]]hooks.syncHookTimeout::
|
||||
+
|
||||
Optional filename for the patchset created hook, if not specified then
|
||||
`patchset-created` will be used.
|
||||
|
||||
[[hooks.draftPublishedHook]]hooks.draftPublishedHook::
|
||||
+
|
||||
Optional filename for the draft published hook, if not specified then
|
||||
`draft-published` will be used.
|
||||
|
||||
[[hooks.commentAddedHook]]hooks.commentAddedHook::
|
||||
+
|
||||
Optional filename for the comment added hook, if not specified then
|
||||
`comment-added` will be used.
|
||||
|
||||
[[hooks.changeMergedHook]]hooks.changeMergedHook::
|
||||
+
|
||||
Optional filename for the change merged hook, if not specified then
|
||||
`change-merged` will be used.
|
||||
|
||||
[[hooks.mergeFailedHook]]hooks.mergeFailedHook::
|
||||
+
|
||||
Optional filename for the merge failed hook, if not specified then
|
||||
`merge-failed` will be used.
|
||||
Optional timeout value in seconds for synchronous hooks, if not specified
|
||||
then 30 seconds will be used.
|
||||
|
||||
[[hooks.changeAbandonedHook]]hooks.changeAbandonedHook::
|
||||
+
|
||||
Optional filename for the change abandoned hook, if not specified then
|
||||
`change-abandoned` will be used.
|
||||
|
||||
[[hooks.changeMergedHook]]hooks.changeMergedHook::
|
||||
+
|
||||
Optional filename for the change merged hook, if not specified then
|
||||
`change-merged` will be used.
|
||||
|
||||
[[hooks.changeRestoredHook]]hooks.changeRestoredHook::
|
||||
+
|
||||
Optional filename for the change restored hook, if not specified then
|
||||
`change-restored` will be used.
|
||||
|
||||
[[hooks.claSignedHook]]hooks.claSignedHook::
|
||||
+
|
||||
Optional filename for the CLA signed hook, if not specified then
|
||||
`cla-signed` will be used.
|
||||
|
||||
[[hooks.commentAddedHook]]hooks.commentAddedHook::
|
||||
+
|
||||
Optional filename for the comment added hook, if not specified then
|
||||
`comment-added` will be used.
|
||||
|
||||
[[hooks.draftPublishedHook]]hooks.draftPublishedHook::
|
||||
+
|
||||
Optional filename for the draft published hook, if not specified then
|
||||
`draft-published` will be used.
|
||||
|
||||
[[hooks.hashtagsChangedHook]]hooks.hashtagsChangedHook::
|
||||
+
|
||||
Optional filename for the hashtags changed hook, if not specified then
|
||||
`hashtags-changed` will be used.
|
||||
|
||||
[[hooks.mergeFailedHook]]hooks.mergeFailedHook::
|
||||
+
|
||||
Optional filename for the merge failed hook, if not specified then
|
||||
`merge-failed` will be used.
|
||||
|
||||
[[hooks.patchsetCreatedHook]]hooks.patchsetCreatedHook::
|
||||
+
|
||||
Optional filename for the patchset created hook, if not specified then
|
||||
`patchset-created` will be used.
|
||||
|
||||
[[hooks.refUpdateHook]]hooks.refUpdateHook::
|
||||
+
|
||||
Optional filename for the ref update hook, if not specified then
|
||||
`ref-update` will be used.
|
||||
|
||||
[[hooks.refUpdatedHook]]hooks.refUpdatedHook::
|
||||
+
|
||||
Optional filename for the ref updated hook, if not specified then
|
||||
@@ -1772,26 +1792,6 @@ Optional filename for the reviewer added hook, if not specified then
|
||||
Optional filename for the topic changed hook, if not specified then
|
||||
`topic-changed` will be used.
|
||||
|
||||
[[hooks.claSignedHook]]hooks.claSignedHook::
|
||||
+
|
||||
Optional filename for the CLA signed hook, if not specified then
|
||||
`cla-signed` will be used.
|
||||
|
||||
[[hooks.refUpdateHook]]hooks.refUpdateHook::
|
||||
+
|
||||
Optional filename for the ref update hook, if not specified then
|
||||
`ref-update` will be used.
|
||||
|
||||
[[hooks.hashtagsChangedHook]]hooks.hashtagsChangedHook::
|
||||
+
|
||||
Optional filename for the hashtags changed hook, if not specified then
|
||||
`hashtags-changed` will be used.
|
||||
|
||||
[[hooks.syncHookTimeout]]hooks.syncHookTimeout::
|
||||
+
|
||||
Optional timeout value in seconds for synchronous hooks, if not specified
|
||||
then 30 seconds will be used.
|
||||
|
||||
[[http]]
|
||||
=== Section http
|
||||
|
||||
|
||||
@@ -336,6 +336,33 @@ plugins that have a dependency on GWT.
|
||||
* Update to the same GWT version in the `gwtjsonrpc` project, and release a
|
||||
new version.
|
||||
|
||||
=== Updating to new version of CodeMirror
|
||||
|
||||
* Clone the git from https://github.com/codemirror/CodeMirror
|
||||
* Checkout the version needed
|
||||
* If the needed version is not a tagged version, use `git describe` to determine
|
||||
the version number:
|
||||
+
|
||||
----
|
||||
git describe --tags
|
||||
----
|
||||
|
||||
* Create the release zip file:
|
||||
+
|
||||
----
|
||||
git archive --format=zip --prefix=codemirror-4.10.0-6-gd0a2dda/ d0a2dda > 4.10.0-6-gd0a2dda.zip
|
||||
----
|
||||
|
||||
* Determine the sha1 hash of the zip file:
|
||||
+
|
||||
----
|
||||
openssl sha1 4.10.0-6-gd0a2dda.zip
|
||||
----
|
||||
|
||||
* Upload the zip file to the
|
||||
link:https://console.developers.google.com/project/164060093628/storage/gerrit-maven/[
|
||||
gerrit-maven] storage bucket
|
||||
|
||||
GERRIT
|
||||
------
|
||||
Part of link:index.html[Gerrit Code Review]
|
||||
|
||||
@@ -134,13 +134,21 @@ The setting determines whether or not the diff table header with the patch set
|
||||
selection should be automatically hidden when scrolling down more than half of
|
||||
a page.
|
||||
|
||||
* Highlight search results on scrollbar.
|
||||
+
|
||||
Search results in vim mode are highlighted in the scrollbar with gold
|
||||
colored annotations.
|
||||
|
||||
* Set line length to 72 characters for commit messages.
|
||||
|
||||
* Add syntax highlighting for several new modes:
|
||||
|
||||
** link:https://code.google.com/p/gerrit/issues/detail?id=2848[Issue 2848]: CSharp
|
||||
** Dart
|
||||
** Dockerfile
|
||||
** GLSL shader
|
||||
** Objective C
|
||||
** (link:http://code.google.com/p/gerrit/issues/detail?id=2779[Issue 2779]) reStructured text
|
||||
** link:http://code.google.com/p/gerrit/issues/detail?id=2779[Issue 2779]: reStructured text
|
||||
** Soy
|
||||
|
||||
REST
|
||||
@@ -182,9 +190,6 @@ Delete file in Change Edit].
|
||||
* link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.11/rest-api-changes.html#get-edit-file[
|
||||
Retrieve file content from Change Edit].
|
||||
|
||||
* link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.11/rest-api-changes.html#get-edit-file-mime-type[
|
||||
Retrieve file content MIME type from Change Edit].
|
||||
|
||||
* link:https://gerrit-documentation.storage.googleapis.com/Documentation/2.11/rest-api-changes.html#get-edit-message[
|
||||
Retrieve commit message from Change Edit or current patch set of the change].
|
||||
|
||||
@@ -475,13 +480,10 @@ to the default tab ("Related Changes").
|
||||
Side-By-Side Diff
|
||||
^^^^^^^^^^^^^^^^^
|
||||
|
||||
* link:https://code.google.com/p/gerrit/issues/detail?id=2848[Issue 2848]:
|
||||
Add support for CSharp syntax highlighting.
|
||||
|
||||
* Remove support for syntax highlighting of Restructured Text and Go file types.
|
||||
* Return to normal mode after editing a draft comment.
|
||||
+
|
||||
Syntax highlighting for these file types caused rendering failures due to a
|
||||
link:https://github.com/codemirror/CodeMirror/issues/2850[bug in CodeMirror].
|
||||
Previously it would remain in visual mode.
|
||||
|
||||
|
||||
Project Screen
|
||||
^^^^^^^^^^^^^^
|
||||
@@ -532,7 +534,7 @@ Upgrades
|
||||
|
||||
* Update ASM to 5.0.3.
|
||||
|
||||
* Update CodeMirror to 4.9.
|
||||
* Update CodeMirror to 4.10.0-6-gd0a2dda.
|
||||
|
||||
* Update Guava to 18.0.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user