diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-09-09 13:37:17 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-09-09 13:37:17 +0000 |
commit | 2b3a1da6f3ceb4c78c055f14dfe93dbe818366d3 (patch) | |
tree | b6c585da17148c565687bd71ff55f89d41d8044a /app/assets/stylesheets/pages | |
parent | 4bdcbc85987a03f21bc326905b581239f74f8b04 (diff) | |
parent | 913857e57765f6911f171fb2fcd12532d6b6f1df (diff) | |
download | gitlab-ce-2b3a1da6f3ceb4c78c055f14dfe93dbe818366d3.tar.gz |
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
Diffstat (limited to 'app/assets/stylesheets/pages')
0 files changed, 0 insertions, 0 deletions