diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-05-09 16:15:01 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-05-10 13:59:05 -0500 |
| commit | 53568da9ed6e2c4bae3c06b0fb1d595033921334 (patch) | |
| tree | 9d901d554f970ca1e0dbc40948539e03847dd649 | |
| parent | e3911a1896d8725f7b739929b7de1ab09917eed5 (diff) | |
| download | gitlab-ce-53568da9ed6e2c4bae3c06b0fb1d595033921334.tar.gz | |
Update Ace Editor
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -197,7 +197,7 @@ gem 'licensee', '~> 8.0.0' gem "rack-attack", '~> 4.3.1' # Ace editor -gem 'ace-rails-ap', '~> 2.0.1' +gem 'ace-rails-ap', '~> 4.0.2' # Keyboard shortcuts gem 'mousetrap-rails', '~> 1.4.6' diff --git a/Gemfile.lock b/Gemfile.lock index 86b9142ef27..c02698bcca7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (2.3.2) RedCloth (4.2.9) - ace-rails-ap (2.0.1) + ace-rails-ap (4.0.2) actionmailer (4.2.6) actionpack (= 4.2.6) actionview (= 4.2.6) @@ -882,7 +882,7 @@ PLATFORMS DEPENDENCIES RedCloth (~> 4.2.9) - ace-rails-ap (~> 2.0.1) + ace-rails-ap (~> 4.0.2) activerecord-deprecated_finders (~> 1.0.3) activerecord-session_store (~> 0.1.0) acts-as-taggable-on (~> 3.4) |