diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 23:29:41 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-05-25 23:29:41 +0000 |
| commit | 3d009f77853261d43f1d5302d8016f4641ba5fca (patch) | |
| tree | 6416c7ee98aa2d88c3c205d69ce62c0121881c78 /Gemfile.lock | |
| parent | 4b4cda85b24bbf825a37f55b4ce1430c1ccc9965 (diff) | |
| parent | 527d64463530df5a2f5f800885f5f84920b1058b (diff) | |
| download | gitlab-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?
cc. @jschatz1
See merge request !3944
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index dbc0fd15ef4..fa2b72b2524 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -102,7 +102,6 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (8.2.1) - cal-heatmap-rails (3.6.0) capybara (2.6.2) addressable mime-types (>= 1.16) @@ -908,7 +907,6 @@ DEPENDENCIES bullet bundler-audit byebug - cal-heatmap-rails (~> 3.6.0) capybara (~> 2.6.2) capybara-screenshot (~> 1.0.0) carrierwave (~> 0.10.0) |