Merge branch 'contributed-projects' into 'master'

Improve contributed project and commit calendar selection.

Fixes #2024.

See merge request !1554

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)

app/models/user.rb

@@ -623,9 +623,10 @@ class User < ActiveRecord::Base
   def contributed_projects_ids
     Event.where(author_id: self).
       where("created_at > ?", Time.now - 1.year).
-      code_push.
+      where("action = :pushed OR (target_type = 'MergeRequest' AND action = :created)", 
+        pushed: Event::PUSHED, created: Event::CREATED).
       reorder(project_id: :desc).
-      select('DISTINCT(project_id)').
-      map(&:project_id)
+      select(:project_id).
+      uniq
   end
 end