dec4e89e5b
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/
117 lines
2.5 KiB
Ruby
117 lines
2.5 KiB
Ruby
class UsersController < ApplicationController
|
|
skip_before_action :authenticate_user!
|
|
before_action :set_user
|
|
|
|
def show
|
|
respond_to do |format|
|
|
format.html
|
|
|
|
format.atom do
|
|
load_events
|
|
render layout: false
|
|
end
|
|
|
|
format.json do
|
|
load_events
|
|
pager_json("events/_events", @events.count)
|
|
end
|
|
end
|
|
end
|
|
|
|
def groups
|
|
load_groups
|
|
|
|
respond_to do |format|
|
|
format.html { render 'show' }
|
|
format.json do
|
|
render json: {
|
|
html: view_to_html_string("shared/groups/_list", groups: @groups)
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
def projects
|
|
load_projects
|
|
|
|
respond_to do |format|
|
|
format.html { render 'show' }
|
|
format.json do
|
|
render json: {
|
|
html: view_to_html_string("shared/projects/_list", projects: @projects, remote: true)
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
def contributed
|
|
load_contributed_projects
|
|
|
|
respond_to do |format|
|
|
format.html { render 'show' }
|
|
format.json do
|
|
render json: {
|
|
html: view_to_html_string("shared/projects/_list", projects: @contributed_projects)
|
|
}
|
|
end
|
|
end
|
|
end
|
|
|
|
def calendar
|
|
calendar = contributions_calendar
|
|
@timestamps = calendar.timestamps
|
|
@starting_year = calendar.starting_year
|
|
@starting_month = calendar.starting_month
|
|
|
|
render 'calendar', layout: false
|
|
end
|
|
|
|
def calendar_activities
|
|
@calendar_date = Date.parse(params[:date]) rescue Date.today
|
|
@events = contributions_calendar.events_by_date(@calendar_date)
|
|
|
|
render 'calendar_activities', layout: false
|
|
end
|
|
|
|
private
|
|
|
|
def set_user
|
|
@user = User.find_by_username!(params[:username])
|
|
end
|
|
|
|
def contributed_projects
|
|
ContributedProjectsFinder.new(@user).execute(current_user)
|
|
end
|
|
|
|
def contributions_calendar
|
|
@contributions_calendar ||= Gitlab::ContributionsCalendar.
|
|
new(contributed_projects, @user)
|
|
end
|
|
|
|
def load_events
|
|
# Get user activity feed for projects common for both users
|
|
@events = @user.recent_events.
|
|
merge(projects_for_current_user).
|
|
references(:project).
|
|
with_associations.
|
|
limit_recent(20, params[:offset])
|
|
end
|
|
|
|
def load_projects
|
|
@projects =
|
|
PersonalProjectsFinder.new(@user).execute(current_user)
|
|
.page(params[:page]).per(PER_PAGE)
|
|
end
|
|
|
|
def load_contributed_projects
|
|
@contributed_projects = contributed_projects.joined(@user)
|
|
end
|
|
|
|
def load_groups
|
|
@groups = @user.groups.order_id_desc
|
|
end
|
|
|
|
def projects_for_current_user
|
|
ProjectsFinder.new.execute(current_user)
|
|
end
|
|
end
|