diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-28 07:27:13 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-28 07:27:13 +0000 |
| commit | 7e17f9bc89b04496e062d56c119f75fbb3f81208 (patch) | |
| tree | ceb96ee5f1d33f21ca66ab17707bc626685b9b89 /app/controllers | |
| parent | b5aac468693f6ffaada170aebedc623768ce87d4 (diff) | |
| parent | 288e8ea1e77d46197f6c93ae1f5d0f5cc810625f (diff) | |
| download | gitlab-ce-7e17f9bc89b04496e062d56c119f75fbb3f81208.tar.gz | |
Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into 'master'
Resolve "Transform user profile javascript into async bundle"
Closes #35224
See merge request !12929
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/users_controller.rb | 5 |
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 |