diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-16 15:41:49 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-16 15:41:49 +0000 |
| commit | 374cdda3c0072218126f717f85f321b566a3262f (patch) | |
| tree | 167baf0f305b31c30eaf31440ef4c06023fcf462 /Gemfile | |
| parent | ba89ee1f7d9e126dc6306a857da5abe816a18047 (diff) | |
| parent | 90a07deb7995014688c67d54250dca6cb81dc556 (diff) | |
| download | gitlab-ce-374cdda3c0072218126f717f85f321b566a3262f.tar.gz | |
Merge branch 'charlock-holmes-0.7.5' into 'master'
Use charlock_holmes 0.7.5
See merge request !13602
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -232,7 +232,7 @@ gem 'ace-rails-ap', '~> 4.1.0' gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding -gem 'charlock_holmes', '~> 0.7.3' +gem 'charlock_holmes', '~> 0.7.5' # Faster JSON gem 'oj', '~> 2.17.4' |