From a46fe875c6aea206e575e2b083bd31ed36ee1b1e Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 4 Dec 2014 21:49:19 +0200
Subject: Feature: atom feed for user activity

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/controllers/users_controller.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0b442f5383a..67af1801bda 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,9 +20,14 @@ class UsersController < ApplicationController
 
     # Get user activity feed for projects common for both users
     @events = @user.recent_events.
-      where(project_id: authorized_projects_ids).limit(20)
+      where(project_id: authorized_projects_ids).limit(30)
 
     @title = @user.name
+
+    respond_to do |format|
+      format.html
+      format.atom { render layout: false }
+    end
   end
 
   def determine_layout
-- 
cgit v1.2.1


From 792ced2f4190226c3335967a8e5a30d3b72bd4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Rosen=C3=B6gger?= <123haynes@gmail.com>
Date: Wed, 28 Jan 2015 22:18:22 +0100
Subject: Add a commit calendar to the user profile

---
 app/controllers/users_controller.rb | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 67af1801bda..a5e80f7e008 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  skip_before_filter :authenticate_user!, only: [:show]
+  skip_before_filter :authenticate_user!, only: [:show, :activities]
   layout :determine_layout
 
   def show
@@ -10,7 +10,8 @@ class UsersController < ApplicationController
     end
 
     # Projects user can view
-    authorized_projects_ids = ProjectsFinder.new.execute(current_user).pluck(:id)
+    visible_projects = ProjectsFinder.new.execute(current_user)
+    authorized_projects_ids = visible_projects.pluck(:id)
 
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids)
@@ -24,12 +25,32 @@ class UsersController < ApplicationController
 
     @title = @user.name
 
+    user_repositories = visible_projects.map(&:repository)
+    @timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
+                                                           @user, false)
+    @starting_year = Gitlab::CommitsCalendar.starting_year(@timestamps)
+    @starting_month = Gitlab::CommitsCalendar.starting_month(@timestamps)
+    @last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
+
     respond_to do |format|
       format.html
       format.atom { render layout: false }
     end
   end
 
+  def activities
+    user = User.find_by_username!(params[:username])
+    # Projects user can view
+    visible_projects = ProjectsFinder.new.execute(current_user)
+
+    user_repositories = visible_projects.map(&:repository)
+    user_activities = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
+                                                               user, true)
+    user_activities = Gitlab::CommitsCalendar.commit_activity_match(
+                                              user_activities, params[:date])
+    render json: user_activities.to_json
+  end
+
   def determine_layout
     if current_user
       'navless'
-- 
cgit v1.2.1


From c39f80bdb412bc9cc7646de0929efe8cb5b870d4 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 28 Jan 2015 23:00:41 -0800
Subject: Refactor commit calendar a bit. Fixed dates

---
 app/controllers/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a5e80f7e008..28de2707778 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,8 +28,8 @@ class UsersController < ApplicationController
     user_repositories = visible_projects.map(&:repository)
     @timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
                                                            @user, false)
-    @starting_year = Gitlab::CommitsCalendar.starting_year(@timestamps)
-    @starting_month = Gitlab::CommitsCalendar.starting_month(@timestamps)
+    @starting_year = (Time.now - 1.year).strftime("%Y")
+    @starting_month = Date.today.strftime("%m").to_i
     @last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
 
     respond_to do |format|
-- 
cgit v1.2.1


From a9288e554e55e843b95ab6f8109a4c610af64c83 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 00:53:43 -0800
Subject: Cleanup and make contribution calendar faster

---
 app/controllers/users_controller.rb | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 28de2707778..9e5ea6cfa45 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -25,12 +25,12 @@ class UsersController < ApplicationController
 
     @title = @user.name
 
+    # Get user repositories and collect timestamps for commits
     user_repositories = visible_projects.map(&:repository)
-    @timestamps = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
-                                                           @user, false)
+    calendar = Gitlab::CommitsCalendar.new(user_repositories, @user)
+    @timestamps = calendar.timestamps
     @starting_year = (Time.now - 1.year).strftime("%Y")
     @starting_month = Date.today.strftime("%m").to_i
-    @last_commit_date = Gitlab::CommitsCalendar.last_commit_date(@timestamps)
 
     respond_to do |format|
       format.html
@@ -38,19 +38,6 @@ class UsersController < ApplicationController
     end
   end
 
-  def activities
-    user = User.find_by_username!(params[:username])
-    # Projects user can view
-    visible_projects = ProjectsFinder.new.execute(current_user)
-
-    user_repositories = visible_projects.map(&:repository)
-    user_activities = Gitlab::CommitsCalendar.create_timestamp(user_repositories,
-                                                               user, true)
-    user_activities = Gitlab::CommitsCalendar.commit_activity_match(
-                                              user_activities, params[:date])
-    render json: user_activities.to_json
-  end
-
   def determine_layout
     if current_user
       'navless'
-- 
cgit v1.2.1


From 1f0e16569f1924ed967bff9f4f78bbee874251db Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 01:20:17 -0800
Subject: Load contribution calendar via AJAX

---
 app/controllers/users_controller.rb | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9e5ea6cfa45..8c96f67a2a4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,14 +1,7 @@
 class UsersController < ApplicationController
-  skip_before_filter :authenticate_user!, only: [:show, :activities]
   layout :determine_layout
 
   def show
-    @user = User.find_by_username!(params[:username])
-
-    unless current_user || @user.public_profile?
-      return authenticate_user!
-    end
-
     # Projects user can view
     visible_projects = ProjectsFinder.new.execute(current_user)
     authorized_projects_ids = visible_projects.pluck(:id)
@@ -25,6 +18,15 @@ class UsersController < ApplicationController
 
     @title = @user.name
 
+    respond_to do |format|
+      format.html
+      format.atom { render layout: false }
+    end
+  end
+
+  def calendar
+    visible_projects = ProjectsFinder.new.execute(current_user)
+
     # Get user repositories and collect timestamps for commits
     user_repositories = visible_projects.map(&:repository)
     calendar = Gitlab::CommitsCalendar.new(user_repositories, @user)
@@ -32,10 +34,7 @@ class UsersController < ApplicationController
     @starting_year = (Time.now - 1.year).strftime("%Y")
     @starting_month = Date.today.strftime("%m").to_i
 
-    respond_to do |format|
-      format.html
-      format.atom { render layout: false }
-    end
+    render 'calendar', layout: false
   end
 
   def determine_layout
@@ -45,4 +44,14 @@ class UsersController < ApplicationController
       'public_users'
     end
   end
+
+  private
+
+  def authenticate_user!
+    @user = User.find_by_username!(params[:username])
+
+    unless current_user || @user.public_profile?
+      return authenticate_user!
+    end
+  end
 end
-- 
cgit v1.2.1


From 08582f153249d91d361977d7968126a420739a8b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 08:55:57 -0800
Subject: Improve user calendar authentification and tests

---
 app/controllers/users_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c96f67a2a4..ff5e31067fb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,4 +1,6 @@
 class UsersController < ApplicationController
+  skip_before_filter :authenticate_user!
+  before_filter :set_user
   layout :determine_layout
 
   def show
@@ -47,7 +49,7 @@ class UsersController < ApplicationController
 
   private
 
-  def authenticate_user!
+  def set_user
     @user = User.find_by_username!(params[:username])
 
     unless current_user || @user.public_profile?
-- 
cgit v1.2.1


From f1cf49218fb40b61f82ff74dbb7eaba32b439a5a Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Jan 2015 17:07:44 -0800
Subject: Improve contribution calendar on user page

* cache user contributions for day
* ignore forks in calendar contribtuions
---
 app/controllers/users_controller.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ff5e31067fb..57d8ef09faf 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -28,13 +28,10 @@ class UsersController < ApplicationController
 
   def calendar
     visible_projects = ProjectsFinder.new.execute(current_user)
-
-    # Get user repositories and collect timestamps for commits
-    user_repositories = visible_projects.map(&:repository)
-    calendar = Gitlab::CommitsCalendar.new(user_repositories, @user)
+    calendar = Gitlab::CommitsCalendar.new(visible_projects, @user)
     @timestamps = calendar.timestamps
-    @starting_year = (Time.now - 1.year).strftime("%Y")
-    @starting_month = Date.today.strftime("%m").to_i
+    @starting_year = calendar.starting_year
+    @starting_month = calendar.starting_month
 
     render 'calendar', layout: false
   end
-- 
cgit v1.2.1


From 34cc4c598232d2e27dcc99f5534dbe318e89cff9 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 13 Feb 2015 14:31:42 +0100
Subject: Link head panel titles to relevant root page.

---
 app/controllers/users_controller.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 57d8ef09faf..84a04c5ebe6 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -19,6 +19,7 @@ class UsersController < ApplicationController
       where(project_id: authorized_projects_ids).limit(30)
 
     @title = @user.name
+    @title_url = user_path(@user)
 
     respond_to do |format|
       format.html
-- 
cgit v1.2.1


From 70edf950fe6baf90bb98c904d9132924e55e50d6 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 17 Feb 2015 22:40:00 -0800
Subject: Show contributed projects on user page and stars for it

---
 app/controllers/users_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 84a04c5ebe6..e4f588c6a60 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,6 +8,9 @@ class UsersController < ApplicationController
     visible_projects = ProjectsFinder.new.execute(current_user)
     authorized_projects_ids = visible_projects.pluck(:id)
 
+    @contributed_projects = Project.where(id: authorized_projects_ids).
+      in_group_namespace
+
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids)
 
-- 
cgit v1.2.1


From a8a328b1513c0aa442faaf8e8dd6f06f86ac3211 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 00:16:42 -0800
Subject: DB performance improvements to GitLab

---
 app/controllers/users_controller.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index e4f588c6a60..b4de500fcf1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,17 +9,18 @@ class UsersController < ApplicationController
     authorized_projects_ids = visible_projects.pluck(:id)
 
     @contributed_projects = Project.where(id: authorized_projects_ids).
-      in_group_namespace
+      in_group_namespace.includes(:namespace)
 
     @projects = @user.personal_projects.
-      where(id: authorized_projects_ids)
+      where(id: authorized_projects_ids).includes(:namespace)
 
     # Collect only groups common for both users
     @groups = @user.groups & GroupsFinder.new.execute(current_user)
 
     # Get user activity feed for projects common for both users
     @events = @user.recent_events.
-      where(project_id: authorized_projects_ids).limit(30)
+      where(project_id: authorized_projects_ids).
+      includes(:target, project: :namespace).limit(30)
 
     @title = @user.name
     @title_url = user_path(@user)
-- 
cgit v1.2.1


From 63f11a68c5e9edf36d062bd4f029d81a0861ef82 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 09:38:46 -0800
Subject: Fix event loading with associations

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b4de500fcf1..8c5605c8b4b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -20,7 +20,7 @@ class UsersController < ApplicationController
     # Get user activity feed for projects common for both users
     @events = @user.recent_events.
       where(project_id: authorized_projects_ids).
-      includes(:target, project: :namespace).limit(30)
+      with_associations.limit(30)
 
     @title = @user.name
     @title_url = user_path(@user)
-- 
cgit v1.2.1


From 2f0a764d310a8fc6628f560debfa930ef2842297 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Wed, 18 Feb 2015 13:28:24 -0800
Subject: Fix user page performance and authorization

---
 app/controllers/users_controller.rb | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8c5605c8b4b..4c2fe4c3c8d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4,11 +4,8 @@ class UsersController < ApplicationController
   layout :determine_layout
 
   def show
-    # Projects user can view
-    visible_projects = ProjectsFinder.new.execute(current_user)
-    authorized_projects_ids = visible_projects.pluck(:id)
-
-    @contributed_projects = Project.where(id: authorized_projects_ids).
+    @contributed_projects = Project.
+      where(id: authorized_projects_ids & @user.contributed_projects_ids).
       in_group_namespace.includes(:namespace)
 
     @projects = @user.personal_projects.
@@ -32,8 +29,8 @@ class UsersController < ApplicationController
   end
 
   def calendar
-    visible_projects = ProjectsFinder.new.execute(current_user)
-    calendar = Gitlab::CommitsCalendar.new(visible_projects, @user)
+    projects = Project.where(id: authorized_projects_ids & @user.contributed_projects_ids)
+    calendar = Gitlab::CommitsCalendar.new(projects, @user)
     @timestamps = calendar.timestamps
     @starting_year = calendar.starting_year
     @starting_month = calendar.starting_month
@@ -58,4 +55,10 @@ class UsersController < ApplicationController
       return authenticate_user!
     end
   end
+
+  def authorized_projects_ids
+    # Projects user can view
+    @authorized_projects_ids ||=
+      ProjectsFinder.new.execute(current_user).pluck(:id)
+  end
 end
-- 
cgit v1.2.1


From 1bf9fa8c7fc027b5273c143949e57eac9bef52a4 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Tue, 24 Feb 2015 16:28:23 +0100
Subject: Exclude forks from profile contributions list.

---
 app/controllers/users_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/controllers/users_controller.rb')

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 4c2fe4c3c8d..8a13394dbac 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -6,7 +6,9 @@ class UsersController < ApplicationController
   def show
     @contributed_projects = Project.
       where(id: authorized_projects_ids & @user.contributed_projects_ids).
-      in_group_namespace.includes(:namespace)
+      in_group_namespace.
+      includes(:namespace).
+      reject(&:forked?)
 
     @projects = @user.personal_projects.
       where(id: authorized_projects_ids).includes(:namespace)
-- 
cgit v1.2.1