summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-28 23:00:41 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-01-28 23:00:41 -0800
commitc39f80bdb412bc9cc7646de0929efe8cb5b870d4 (patch)
tree6c459de47167e38a0110973855cff9b2d2246e5c /app/controllers/users_controller.rb
parent815e9aa283f113051268370908776c5517dab711 (diff)
downloadgitlab-ce-c39f80bdb412bc9cc7646de0929efe8cb5b870d4.tar.gz
Refactor commit calendar a bit. Fixed dates
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a5e80f7e008..28de2707778 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,8 +28,8 @@ class UsersController < ApplicationController
user_repositories = visible_projects.map(&:repository)
@timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
@user, false)
- @starting_year = Gitlab::CommitsCalendar.starting_year(@timestamps)
- @starting_month = Gitlab::CommitsCalendar.starting_month(@timestamps)
+ @starting_year = (Time.now - 1.year).strftime("%Y")
+ @starting_month = Date.today.strftime("%m").to_i
@last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
respond_to do |format|