BigW Consortium Gitlab
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
Name |
Last commit
|
Last update |
---|---|---|
.github | Loading commit data... | |
app | Loading commit data... | |
bin | Loading commit data... | |
builds | Loading commit data... | |
config | Loading commit data... | |
db | Loading commit data... | |
doc | Loading commit data... | |
docker | Loading commit data... | |
features | Loading commit data... | |
fixtures/emojis | Loading commit data... | |
generator_templates/active_record/migration | Loading commit data... | |
lib | Loading commit data... | |
log | Loading commit data... | |
public | Loading commit data... | |
rubocop | Loading commit data... | |
scripts | Loading commit data... | |
shared | Loading commit data... | |
spec | Loading commit data... | |
tmp | Loading commit data... | |
vendor | Loading commit data... | |
.csscomb.json | Loading commit data... | |
.flayignore | Loading commit data... | |
.foreman | Loading commit data... | |
.gitattributes | Loading commit data... | |
.gitignore | Loading commit data... | |
.gitlab-ci.yml | Loading commit data... | |
.mailmap | Loading commit data... | |
.pkgr.yml | Loading commit data... | |
.rspec | Loading commit data... | |
.rubocop.yml | Loading commit data... | |
.rubocop_todo.yml | Loading commit data... | |
.ruby-version | Loading commit data... | |
.scss-lint.yml | Loading commit data... | |
.vagrant_enabled | Loading commit data... | |
CHANGELOG | Loading commit data... | |
CONTRIBUTING.md | Loading commit data... | |
GITLAB_SHELL_VERSION | Loading commit data... | |
GITLAB_WORKHORSE_VERSION | Loading commit data... | |
Gemfile | Loading commit data... | |
Gemfile.lock | Loading commit data... | |
LICENSE | Loading commit data... | |
MAINTENANCE.md | Loading commit data... | |
PROCESS.md | Loading commit data... | |
Procfile | Loading commit data... | |
README.md | Loading commit data... | |
Rakefile | Loading commit data... | |
VERSION | Loading commit data... | |
config.ru | Loading commit data... | |
doc_styleguide.md | Loading commit data... | |
docker-compose.yml | Loading commit data... |