summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-05-25 23:29:41 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-05-25 23:29:41 +0000
commit3d009f77853261d43f1d5302d8016f4641ba5fca (patch)
tree6416c7ee98aa2d88c3c205d69ce62c0121881c78 /Gemfile
parent4b4cda85b24bbf825a37f55b4ce1430c1ccc9965 (diff)
parent527d64463530df5a2f5f800885f5f84920b1058b (diff)
downloadgitlab-ce-3d009f77853261d43f1d5302d8016f4641ba5fca.tar.gz
Merge branch 'updated-contrib-calendar' into 'master'
POC: Updated contrib calendar In an effort to cut down the JS file size - i've removed the heatmap calendar used for the contributing calendar on users profiles. We already have d3 on the page so why not use it instead of using a library which uses it? ![Screen_Shot_2016-04-27_at_11.08.41](/uploads/64c40f0c766f800fd0e33ac8be7f9644/Screen_Shot_2016-04-27_at_11.08.41.png) cc. @jschatz1 See merge request !3944
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 0 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c236f37e14a..b897dc0a741 100644
--- a/Gemfile
+++ b/Gemfile
@@ -178,9 +178,6 @@ gem 'ruby-fogbugz', '~> 0.2.1'
# d3
gem 'd3_rails', '~> 3.5.0'
-#cal-heatmap
-gem 'cal-heatmap-rails', '~> 3.6.0'
-
# underscore-rails
gem "underscore-rails", "~> 1.8.0"