summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-12-23 14:05:45 -0500
committerRobert Speicher <rspeicher@gmail.com>2015-12-23 14:05:45 -0500
commitfbca7d72d0bea3ecf02357543ca6d38a246563ff (patch)
tree1d3cf75bff9e8f7e460b39bf832aac99c16d9fac
parent9f69a0b2294bfcba720dc0ae9e1aadbb6d77205d (diff)
downloadgitlab-ce-rs-bump-underscore-rails.tar.gz
Bump underscore-rails to ~> 1.8.0rs-bump-underscore-rails
Addresses #2857
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 3d4345978a7..db54bf2f186 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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)