Target right release, rebase got it wrong

This commit is contained in:
Zeger-Jan van de Weg 2016-03-07 12:40:21 +01:00
parent d249da1c16
commit 4231cfeba5
2 changed files with 3 additions and 2 deletions

View File

@ -49,6 +49,7 @@ v 8.5.5
- Fix pagination for filtered dashboard and explore pages
- Fix "Show all" link behavior
- Add #upcoming filter to Milestone filter (Tiago Botelho)
- User deletion is now done in the background so the request can not time out
v 8.5.4
- Do not cache requests for badges (including builds badge)

View File

@ -24,7 +24,7 @@ describe DeleteUserWorker do
context "solo owned groups present" do
let(:solo_owned) { create(:group) }
let(:member) { create(:group_member) }
let(:user) { user = member.user }
let(:user) { member.user }
before do
solo_owned.group_members = [member]
@ -39,7 +39,7 @@ describe DeleteUserWorker do
context "deletions with force" do
let(:solo_owned) { create(:group) }
let(:member) { create(:group_member) }
let(:user) { user = member.user }
let(:user) { member.user }
before do
solo_owned.group_members = [member]