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

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

Merge branch 'fix/sentry-1182' into 'master'
3231ea10 · Douwe Maan · ec68d673 · dec4e89e · 3231ea10
Commit 3231ea10 authored Mar 04, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

users_controller.rb app/controllers/users_controller.rb +2 -6

No files found.
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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