Skip to content
Snippets Groups Projects
Commit 2b3a1da6 authored by Jacob Schatz's avatar Jacob Schatz
Browse files

Merge branch '20300-restore-comments' into 'master'

Restore comments lost when converting CoffeeScript to JavaScript

## What does this MR do?

Restores comments lost in the great fire of !5464.

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

#20300

## What are the relevant issue numbers?

 - #20300 (comments)
 - #20098 (ES6)

## 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)
Closes #20300

See merge request !5541
parents 4bdcbc85 913857e5
No related branches found
No related tags found
1 merge request!5541Restore comments lost when converting CoffeeScript to JavaScript
Pipeline #
Showing
with 124 additions and 8 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment