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 /app/controllers | |
| 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 'app/controllers')
| -rw-r--r-- | app/controllers/users_controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 799421c185b..a99632454d9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -74,8 +74,6 @@ class UsersController < ApplicationController def calendar calendar = contributions_calendar @timestamps = calendar.timestamps - @starting_year = calendar.starting_year - @starting_month = calendar.starting_month render 'calendar', layout: false end |