diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-09 14:50:44 +0000 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-03-10 13:36:33 -0800 |
| commit | 164a157065999707e89771b28e8b727a30d52d3b (patch) | |
| tree | 14eaf4899d38e8c7663f4cb1cc999ff3a404498d | |
| parent | 64a07775b73f184d75e3e83135875eb5b9cb7d72 (diff) | |
| download | gitlab-ce-164a157065999707e89771b28e8b727a30d52d3b.tar.gz | |
Merge branch 'update-ace' into 'master'
Update ACE to 1.2.6
Closes #26640
See merge request !9835
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/update-ace.yml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 62388628eaa..c60c045a4c2 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.1.0) + ace-rails-ap (4.1.2) actionmailer (4.2.8) actionpack (= 4.2.8) actionview (= 4.2.8) diff --git a/changelogs/unreleased/update-ace.yml b/changelogs/unreleased/update-ace.yml new file mode 100644 index 00000000000..dbe476e3ae0 --- /dev/null +++ b/changelogs/unreleased/update-ace.yml @@ -0,0 +1,4 @@ +--- +title: Update code editor (ACE) to 1.2.6, to fix input problems with compose key +merge_request: +author: |