gitlab-org--gitlab-foss/app
Jacob Schatz d97c83096a Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master'
Fix Ace syntax highlighting with compiled assets

## What does this MR do?

Update ACE to 4.1.0 to allow modes (syntax highlighting files for particular languages) to be lazily loaded.

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

Don't think so.

## Why was this MR needed?

Syntax highlighting in the file editor only worked in development and test modes, not in production!

## What are the relevant issue numbers?

Closes #3225.

## Screenshots (if relevant)

First, the test setup - add these lines to `development.rb`:
```ruby
  config.assets.debug = false
  config.assets.compile = false
  config.assets.digest = true
```

Then, before starting the server, run `bundle exec rake assets:clobber assets:precompile`.

Before:

![image](/uploads/486198e273019f8969d2e90560d82928/image.png)

There is an error in the console because `/assets/ace/mode-ruby.js` was not found (it's only available when assets are compiled on demand).

After:

![image](/uploads/6aa0d69b7efdfd6fe6aa22b9a49e9716/image.png)

This loads `/assets/ace/mode-ruby-3915f95a6cc47306b1305e4dcb7aca25b2ef9c49b18ec6011707135b6575d8f3.js`, which works because the precompile step included it and told ACE where to find it.

## Does this MR meet the acceptance criteria?

- [x] [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~~
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5501
2016-08-18 20:31:17 +00:00
..
assets Merge branch '3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui' into 'master' 2016-08-18 20:31:17 +00:00
controllers Merge branch '17334-u2f-device-identifiers' into 'master' 2016-08-18 18:37:56 +00:00
finders Move to project dropdown with infinite scroll for better performance 2016-08-17 07:33:51 +02:00
helpers Merge branch '18334-truncate-award-emoji-users' into 'master' 2016-08-18 20:04:18 +00:00
mailers Add notifications for new user mentions in merge requests 2016-08-15 14:47:16 +01:00
models Merge branch '17334-u2f-device-identifiers' into 'master' 2016-08-18 18:37:56 +00:00
services Rename TodoService#mark_todos_as_done_by_id{,s} 2016-08-18 17:46:24 +02:00
uploaders Remove magic comments from Ruby files (!5456) 2016-07-24 07:08:45 +02:00
validators
views Merge branch '13664-abuse-report-page-should-have-a-maximum-width' into 'master' 2016-08-18 20:24:28 +00:00
workers Tracking of custom events 2016-08-17 10:04:04 +02:00