kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fix/sentry-1182' into 'master'

Browse source 
In UsersController#calendar_activities, when Date isn't parsable, fallback to Date.today

For some reason, GoogleBot accesses `/u/:username/calendar_activities` without
a `:date` param, but then the view was trying to call `#to_s(:short)` which
doesn't exist on `nil`, leading to the following Sentry report:
https://sentry.gitlap.com/gitlab/gitlabcom/issues/1182/

See merge request !3074
This commit is contained in:
Douwe Maan 2016-03-04 20:59:58 +00:00
commit 3231ea10b7
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/users_controller.rb
View file

@ -67,12 +67,8 @@ class UsersController < ApplicationController
end
def calendar_activities
@calendar_date = Date.parse(params[:date]) rescue nil
@events = []
if @calendar_date
@events = contributions_calendar.events_by_date(@calendar_date)
end
@calendar_date = Date.parse(params[:date]) rescue Date.today
@events = contributions_calendar.events_by_date(@calendar_date)
render 'calendar_activities', layout: false
end