summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-06-15 21:11:31 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-06-15 21:11:31 +0000
commit1a832c8f00f55a0a5edb49d53e757e2bb6398060 (patch)
tree28820728def0da8c3b954bc6a13e780e94b314c8 /Gemfile.lock
parentb4e8d59b0e343d8c34f83417175d631b101bc045 (diff)
parent7163229738c4fa534d7909ea168d0612ef89fbef (diff)
downloadgitlab-ce-1a832c8f00f55a0a5edb49d53e757e2bb6398060.tar.gz
Merge branch 'network-assets' into 'master'
Replace raphael-rails with raphael.js and split it from the rest of the JS ## What does this MR do? Removes raphael.js and its related libraries from the default JS bundle. It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it. This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB. ## Are there points in the code the reviewer needs to double check? That tests pass and that there aren't errors on any pages (especially the Network page). ## Why was this MR needed? It's only used on the Network page and was using way too much bandwidth for just one page. ## What are the relevant issue numbers? #14372 #13165 Follow-up to !4394 and !4516. cc: @jschatz1 See merge request !4519
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c1c8c175b1d..a22bd1b1f52 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -556,7 +556,6 @@ GEM
rainbow (2.1.0)
raindrops (0.15.0)
rake (10.5.0)
- raphael-rails (2.1.2)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
@@ -938,7 +937,6 @@ DEPENDENCIES
rails (= 4.2.6)
rails-deprecated_sanitizer (~> 1.0.3)
rainbow (~> 2.1.0)
- raphael-rails (~> 2.1.2)
rblineprof
rdoc (~> 3.6)
recaptcha (~> 3.0)