Merge branch 'update-ace' into 'master'

Update ACE to 1.2.6 Closes #26640 See merge request !9835

Merge branch 'update-ace' into 'master'
65f6bde4 · Rémy Coutable · ca667992 · 53220a28 · 65f6bde4 · 65f6bde4
Commit 65f6bde4 authored Mar 09, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

Gemfile.lock Gemfile.lock +1 -1

update-ace.yml changelogs/unreleased/update-ace.yml +4 -0

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
  remote: https://rubygems.org/
  specs:
    RedCloth (4.3.2)
-    ace-rails-ap (4.1.0)
+    ace-rails-ap (4.1.2)
    actionmailer (4.2.8)
      actionpack (= 4.2.8)
      actionview (= 4.2.8)

--- a/changelogs/unreleased/update-ace.yml
+++ b/changelogs/unreleased/update-ace.yml
+---
+title: Update code editor (ACE) to 1.2.6, to fix input problems with compose key
+merge_request:
+author: