Jacob Schatz 2b3a1da6f3 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		2016-09-09 13:37:17 +00:00
..
config	Small refactor and a few documentation fixes	2016-08-04 19:02:39 +02:00
controllers	Refresh todos count cache when an Issue/MR is deleted	2016-09-08 15:50:07 -03:00
factories	Optimize discussion notes resolving and unresolving	2016-09-06 12:14:09 -03:00
features	Move write_note into SlashCommandsHelper and update other dependent specs	2016-09-08 18:52:55 -04:00
finders	Use PipelinesFinder in Pipelines API	2016-09-07 15:38:03 +02:00
fixtures	Returns the total number of issues in the JSON response	2016-08-31 09:30:37 +01:00
helpers	Merge branch 'sidekiq-ps-parsing' into 'master'	2016-09-09 09:53:24 +00:00
initializers	Give priority to environment variables	2016-08-03 15:48:48 +01:00
javascripts	Require comments must be included before code	2016-09-08 14:07:27 -05:00
lib	Merge branch 'gitlab-workhorse-safeties' into 'master'	2016-09-09 11:33:08 +00:00
mailers	Merge branch 'master' into 'expiration-date-on-memberships'	2016-08-19 10:58:01 +00:00
models	Merge branch 'smart-pipeline-duration' into 'master'	2016-09-08 17:38:20 +00:00
policies	add project_policy_spec to replace .project_abilities spec	2016-08-30 11:35:06 -07:00
requests	Merge branch 'gitlab-workhorse-safeties' into 'master'	2016-09-09 11:33:08 +00:00
routing	Fix markdown help references	2016-08-26 09:38:21 -05:00
services	Refresh todos count cache when an Issue/MR is deleted	2016-09-08 15:50:07 -03:00
support	Merge branch 'gitlab-workhorse-safeties' into 'master'	2016-09-09 11:33:08 +00:00
tasks/gitlab	Use File::exist? instead of File::exists?	2016-08-11 13:54:45 +03:00
uploaders	Remove VideoJS and clean the integration	2016-07-20 11:36:42 +02:00
views	add feature test	2016-09-06 14:42:43 +02:00
workers	Added cron to prune events older than 12 months.	2016-09-07 19:41:25 +02:00
factories_spec.rb	adds second batch of tests changed to active tense	2016-08-09 15:11:39 +01:00
rails_helper.rb
simplecov_env.rb	Bump SimpleCov merge timeout to 365 days	2016-08-22 13:44:14 +02:00
spec_helper.rb	Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name	2016-08-24 20:56:30 +08:00
teaspoon_env.rb	Add test coverage analysis for CoffeeScript (!5052)	2016-08-07 21:52:37 +02:00