diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-24 14:45:12 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-08-24 14:45:12 +0000 |
| commit | 45bf75637de8a1dc119dfb35c2fdb4227c3b5d02 (patch) | |
| tree | a1252723aac8fa88676ce42fcc06e48806857a64 | |
| parent | e46a3d2fda47f96885b38c6c6caf7dc3e0df19bd (diff) | |
| parent | e6c96c6ed6cb51e25974476babae1f01226b4994 (diff) | |
| download | gitlab-ce-45bf75637de8a1dc119dfb35c2fdb4227c3b5d02.tar.gz | |
Merge branch 'rs-remove-underscore-rails' into 'master'
Remove underscore-rails gem
Closes #36712
See merge request !13781
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 0 insertions, 5 deletions
@@ -207,9 +207,6 @@ gem 'kubeclient', '~> 2.2.0' # d3 gem 'd3_rails', '~> 3.5.0' -# underscore-rails -gem 'underscore-rails', '~> 1.8.0' - # Sanitize user input gem 'sanitize', '~> 2.0' gem 'babosa', '~> 1.0.2' diff --git a/Gemfile.lock b/Gemfile.lock index 7d3c53ee010..17bf48befac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -899,7 +899,6 @@ GEM uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - underscore-rails (1.8.3) unf (0.1.4) unf_ext unf_ext (0.0.7.2) @@ -1163,7 +1162,6 @@ DEPENDENCIES truncato (~> 0.7.8) u2f (~> 0.2.1) uglifier (~> 2.7.2) - underscore-rails (~> 1.8.0) unf (~> 0.1.4) unicorn (~> 5.1.0) unicorn-worker-killer (~> 0.4.4) |