diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-07-26 00:32:00 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-07-27 13:21:59 +0200 |
commit | 174a47201206196b004b8375fb255e28f4224fc7 (patch) | |
tree | e2245ff00e6948c913f6faf5621d62a313775962 | |
parent | 45f9c9f7ae2ece237c9077c6127d973faf4815ec (diff) | |
download | gitlab-ce-174a47201206196b004b8375fb255e28f4224fc7.tar.gz |
Merge branch 'es6-gitlab-sytanx-highlighting' into 'master'
Added '*.js.es6 gitlab-language=javascript' to .gitattributes
## What does this MR do?
According to the branch name this adds the `sytanx` highlighting for `.js.es6` files, but this actually adds the `syntax` highlighting. :laughing:
## Are there points in the code the reviewer needs to double check?
Is this the right place? :runner:
## Why was this MR needed?
We need pretty ES6 diffs.
## What are the relevant issue numbers?
Flyin' solo :airplane_departure:
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5486
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r-- | .gitattributes | 3 | ||||
-rw-r--r-- | CHANGELOG | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index 7e800609e6c..17cbaa5eef5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -CHANGELOG merge=union
\ No newline at end of file +CHANGELOG merge=union +*.js.es6 gitlab-language=javascript diff --git a/CHANGELOG b/CHANGELOG index dd12d3f5657..acace820203 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -12,6 +12,7 @@ v 8.10.2 (unreleased) - Ensure relative paths for video are rewritten as we do for images. !5474 - Ensure current user can retry a build before showing the 'Retry' button. !5476 - Add ENV variable to skip repository storages validations. !5478 + - Added `*.js.es6 gitlab-language=javascript` to `.gitattributes`. !5486 - Don't show comment button in gutter of diffs on MR discussion tab v 8.10.1 |