diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-24 10:36:36 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-24 10:36:36 +0000 |
| commit | 75c3a2f89b52c7981326693b73b0ad8055a551e8 (patch) | |
| tree | 9a5861eac2149d3886fc5b63b595410b7663d5cf | |
| parent | d095cbd70b7735525a6f220466e2af7968f742b4 (diff) | |
| parent | fbca7d72d0bea3ecf02357543ca6d38a246563ff (diff) | |
| download | gitlab-ce-75c3a2f89b52c7981326693b73b0ad8055a551e8.tar.gz | |
Merge branch 'rs-bump-underscore-rails' into 'master'
Bump underscore-rails to ~> 1.8.0
Addresses #2857
See merge request !2193
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -172,7 +172,7 @@ gem 'd3_rails', '~> 3.5.5' gem "cal-heatmap-rails", "~> 0.0.1" # underscore-rails -gem "underscore-rails", "~> 1.4.4" +gem "underscore-rails", "~> 1.8.0" # Sanitize user input gem "sanitize", '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7477b42f2d8..4f4b10c0fb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -769,7 +769,7 @@ GEM uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - underscore-rails (1.4.4) + underscore-rails (1.8.3) unf (0.1.4) unf_ext unf_ext (0.0.7.1) @@ -965,7 +965,7 @@ DEPENDENCIES tinder (~> 1.10.0) turbolinks (~> 2.5.0) uglifier (~> 2.7.2) - underscore-rails (~> 1.4.4) + underscore-rails (~> 1.8.0) unf (~> 0.1.4) unicorn (~> 4.8.2) unicorn-worker-killer (~> 0.4.2) |