2013-01-22 12:05:01 -05:00
|
|
|
class UsersController < ApplicationController
|
2015-04-16 08:03:37 -04:00
|
|
|
skip_before_action :authenticate_user!
|
|
|
|
before_action :set_user
|
2013-06-07 10:31:12 -04:00
|
|
|
|
2013-01-22 12:05:01 -05:00
|
|
|
def show
|
2015-11-18 06:32:35 -05:00
|
|
|
@contributed_projects = contributed_projects.joined(@user).reject(&:forked?)
|
2015-02-18 01:40:00 -05:00
|
|
|
|
2015-11-18 06:32:35 -05:00
|
|
|
@projects = PersonalProjectsFinder.new(@user).execute(current_user)
|
2014-06-05 13:37:35 -04:00
|
|
|
|
2015-12-28 06:32:18 -05:00
|
|
|
@groups = @user.groups.order_id_desc
|
2014-06-05 13:37:35 -04:00
|
|
|
|
2015-01-29 04:20:17 -05:00
|
|
|
respond_to do |format|
|
|
|
|
format.html
|
2015-03-22 22:41:12 -04:00
|
|
|
|
|
|
|
format.atom do
|
|
|
|
load_events
|
|
|
|
render layout: false
|
|
|
|
end
|
|
|
|
|
2015-03-22 18:40:26 -04:00
|
|
|
format.json do
|
|
|
|
load_events
|
|
|
|
pager_json("events/_events", @events.count)
|
|
|
|
end
|
2015-01-29 04:20:17 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def calendar
|
2015-03-22 02:48:08 -04:00
|
|
|
calendar = contributions_calendar
|
2015-01-29 03:53:43 -05:00
|
|
|
@timestamps = calendar.timestamps
|
2015-01-29 20:07:44 -05:00
|
|
|
@starting_year = calendar.starting_year
|
|
|
|
@starting_month = calendar.starting_month
|
2015-01-28 16:18:22 -05:00
|
|
|
|
2015-01-29 04:20:17 -05:00
|
|
|
render 'calendar', layout: false
|
2013-01-22 12:05:01 -05:00
|
|
|
end
|
2014-01-27 09:53:59 -05:00
|
|
|
|
2015-03-13 06:39:26 -04:00
|
|
|
def calendar_activities
|
2015-03-22 02:48:08 -04:00
|
|
|
@calendar_date = Date.parse(params[:date]) rescue nil
|
|
|
|
@events = []
|
2015-03-13 06:39:26 -04:00
|
|
|
|
2015-03-22 02:48:08 -04:00
|
|
|
if @calendar_date
|
|
|
|
@events = contributions_calendar.events_by_date(@calendar_date)
|
2015-03-13 06:39:26 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
render 'calendar_activities', layout: false
|
|
|
|
end
|
|
|
|
|
2015-01-29 04:20:17 -05:00
|
|
|
private
|
|
|
|
|
2015-01-29 11:55:57 -05:00
|
|
|
def set_user
|
2015-01-29 04:20:17 -05:00
|
|
|
@user = User.find_by_username!(params[:username])
|
|
|
|
end
|
2015-02-18 16:28:24 -05:00
|
|
|
|
2015-03-22 02:48:08 -04:00
|
|
|
def contributed_projects
|
2015-11-18 06:32:35 -05:00
|
|
|
ContributedProjectsFinder.new(@user).execute(current_user)
|
2015-03-22 02:48:08 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def contributions_calendar
|
|
|
|
@contributions_calendar ||= Gitlab::ContributionsCalendar.
|
2015-03-22 16:55:00 -04:00
|
|
|
new(contributed_projects.reject(&:forked?), @user)
|
2015-03-22 02:48:08 -04:00
|
|
|
end
|
2015-03-23 12:45:40 -04:00
|
|
|
|
2015-03-22 18:40:26 -04:00
|
|
|
def load_events
|
|
|
|
# Get user activity feed for projects common for both users
|
|
|
|
@events = @user.recent_events.
|
2015-11-18 06:32:35 -05:00
|
|
|
merge(projects_for_current_user).
|
|
|
|
references(:project).
|
|
|
|
with_associations.
|
|
|
|
limit_recent(20, params[:offset])
|
|
|
|
end
|
2015-03-22 18:40:26 -04:00
|
|
|
|
2015-11-18 06:32:35 -05:00
|
|
|
def projects_for_current_user
|
|
|
|
ProjectsFinder.new.execute(current_user)
|
2015-03-22 18:40:26 -04:00
|
|
|
end
|
2013-01-22 12:05:01 -05:00
|
|
|
end
|