summaryrefslogtreecommitdiff
path: root/app/controllers/users_controller.rb
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-07-18 17:05:41 -0500
committerMike Greiling <mike@pixelcog.com>2017-07-18 17:05:41 -0500
commit339baf8f5d7716baa1a6924c94f1896cf8f6805f (patch)
tree37845f7055e3d2f5a76445182f66237f33f1276d /app/controllers/users_controller.rb
parent651bf36cc5d485a7c136f93b21b97bc807dd2188 (diff)
downloadgitlab-ce-339baf8f5d7716baa1a6924c94f1896cf8f6805f.tar.gz
refactor async calendar data
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r--app/controllers/users_controller.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8131eba6a2f..4ee855806ab 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -73,10 +73,7 @@ class UsersController < ApplicationController
end
def calendar
- calendar = contributions_calendar
- @activity_dates = calendar.activity_dates
-
- render 'calendar', layout: false
+ render json: contributions_calendar.activity_dates
end
def calendar_activities