diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-26 12:52:37 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-17 14:33:56 +0100 |
| commit | b73ff13e8a1c406d162721895687659d9e11c7a8 (patch) | |
| tree | b531ccb7e11991701102103ed9f7570b24b28951 | |
| parent | d1da2e8180d92e5f4a8b5ebb36b0f4e4d0618bf8 (diff) | |
| download | gitlab-ce-3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui.tar.gz | |
Fix Ace syntax highlighting with compiled assets3225-ace-editor-causing-404-errors-every-time-you-try-to-edit-a-file-in-the-webui
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 837e9e27aba..f1684e9f3f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -59,6 +59,7 @@ v 8.11.0 (unreleased) - Update version_sorter and use new interface for faster tag sorting - Optimize checking if a user has read access to a list of issues !5370 - Store all DB secrets in secrets.yml, under descriptive names !5274 + - Fix syntax highlighting in file editor - Nokogiri's various parsing methods are now instrumented - Add archived badge to project list !5798 - Add simple identifier to public SSH keys (muteor) @@ -201,7 +201,7 @@ gem 'licensee', '~> 8.0.0' gem 'rack-attack', '~> 4.3.1' # Ace editor -gem 'ace-rails-ap', '~> 4.0.2' +gem 'ace-rails-ap', '~> 4.1.0' # Keyboard shortcuts gem 'mousetrap-rails', '~> 1.4.6' diff --git a/Gemfile.lock b/Gemfile.lock index 2244c20203b..3c7b3317a10 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.3.2) - ace-rails-ap (4.0.2) + ace-rails-ap (4.1.0) actionmailer (4.2.7.1) actionpack (= 4.2.7.1) actionview (= 4.2.7.1) @@ -796,7 +796,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.3.2) - ace-rails-ap (~> 4.0.2) + ace-rails-ap (~> 4.1.0) activerecord-session_store (~> 1.0.0) acts-as-taggable-on (~> 3.4) addressable (~> 2.3.8) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e596b98603b..0d6b7b16002 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,7 +26,7 @@ /*= require bootstrap/tooltip */ /*= require bootstrap/popover */ /*= require select2 */ -/*= require ace/ace */ +/*= require ace-rails-ap */ /*= require ace/ext-searchbox */ /*= require underscore */ /*= require dropzone */ |