diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-01 10:06:56 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-01 10:06:56 +0000 |
| commit | dc6099a5fa14b82f78514bb329962f397d1acd26 (patch) | |
| tree | cf7446aca3cc0494d4b76dcd778c7ccbb63299eb /app | |
| parent | 3292940745653a76dadd169a203619c5dfeebd4e (diff) | |
| parent | 8fe72af3dc14a94e0823ed21016d005f509ea2a1 (diff) | |
| download | gitlab-ce-dc6099a5fa14b82f78514bb329962f397d1acd26.tar.gz | |
Merge branch 'fix/contributions-forked-projects' into 'master'
include contributions from forked projects on profile calendar
Shows contributions from forked projects in the calendar
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3612
See merge request !2918
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6055b606086..626213c6728 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -57,7 +57,7 @@ class UsersController < ApplicationController def contributions_calendar @contributions_calendar ||= Gitlab::ContributionsCalendar. - new(contributed_projects.reject(&:forked?), @user) + new(contributed_projects, @user) end def load_events |