diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-05-26 11:45:23 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-26 11:45:23 +0300 |
commit | 272d482f17c3bc97b1ae54be5e545389ba4246dc (patch) | |
tree | 3074be7369a96b266b5e4ff3426114107948ee11 /app/controllers/users_controller.rb | |
parent | 0378c5b8792cdfc973df932eb64d1a2d685c8792 (diff) | |
parent | adc64e4583dc42399f681a9b17490f98b8c4bec0 (diff) | |
download | gitlab-ce-sidebar-expand-collapse.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into sidebar-expand-collapsesidebar-expand-collapse
Diffstat (limited to 'app/controllers/users_controller.rb')
-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 |