summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-01 10:06:56 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-01 10:06:56 +0000
commitdc6099a5fa14b82f78514bb329962f397d1acd26 (patch)
treecf7446aca3cc0494d4b76dcd778c7ccbb63299eb
parent3292940745653a76dadd169a203619c5dfeebd4e (diff)
parent8fe72af3dc14a94e0823ed21016d005f509ea2a1 (diff)
downloadgitlab-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
-rw-r--r--CHANGELOG1
-rw-r--r--app/controllers/users_controller.rb2
-rw-r--r--spec/controllers/users_controller_spec.rb18
3 files changed, 20 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d3e28dcfc76..449c4c5c56b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.6.0 (unreleased)
+ - Contributions to forked projects are included in calendar
- Improve the formatting for the user page bio (Connor Shea)
- Fix issue when pushing to projects ending in .wiki
- Fix avatar stretching by providing a cropping feature (Johann Pardanaud)
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
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 104a5f50143..7337ff58be1 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -41,6 +41,7 @@ describe UsersController do
end
describe 'GET #calendar' do
+
it 'renders calendar' do
sign_in(user)
@@ -48,6 +49,23 @@ describe UsersController do
expect(response).to render_template('calendar')
end
+
+ context 'forked project' do
+ let!(:project) { create(:project) }
+ let!(:forked_project) { Projects::ForkService.new(project, user).execute }
+
+ before do
+ sign_in(user)
+ project.team << [user, :developer]
+ EventCreateService.new.push(project, user, [])
+ EventCreateService.new.push(forked_project, user, [])
+ end
+
+ it 'includes forked projects' do
+ get :calendar, username: user.username
+ expect(assigns(:contributions_calendar).projects.count).to eq(2)
+ end
+ end
end
describe 'GET #calendar_activities' do