opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16' into stable-3.0

Browse Source 
* stable-2.16:
  Highlight .mjs as javascript
  Set version to 2.15.15-SNAPSHOT
  Update buildifier to 0.26

Change-Id: I98261be3f7e48747401e9cff45bb3314288c40d4
This commit is contained in:
David Pursehouse
2019-06-15 18:55:35 +09:00
parent 7392c09146 1f8093b379
commit 9967e1f0dc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/dev-contributing.txt
View File

@@ -166,7 +166,7 @@ To format Java source code, Gerrit uses the
link:https://github.com/google/google-java-format[`google-java-format`]
tool (version 1.7), and to format Bazel BUILD, WORKSPACE and .bzl files the
link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
tool (version 0.22.0).
tool (version 0.26.0).
These tools automatically apply format according to the style guides; this
streamlines code review by reducing the need for time-consuming, tedious,
and contentious discussions about trivial issues like whitespace.

2
resources/com/google/gerrit/server/mime/mime-types.properties
View File

@@ -124,7 +124,7 @@ markdown = text/x-markdown
mbox = application/mbox
md = text/x-markdown
mirc = text/mirc
mjs = text/x-mjs
mjs = text/javascript
mkd = text/x-markdown
ml = text/x-ocaml
mli = text/x-ocaml