Commit 4231cfeb authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Target right release, rebase got it wrong

parent d249da1c
...@@ -49,6 +49,7 @@ v 8.5.5 ...@@ -49,6 +49,7 @@ v 8.5.5
- Fix pagination for filtered dashboard and explore pages - Fix pagination for filtered dashboard and explore pages
- Fix "Show all" link behavior - Fix "Show all" link behavior
- Add #upcoming filter to Milestone filter (Tiago Botelho) - 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 v 8.5.4
- Do not cache requests for badges (including builds badge) - Do not cache requests for badges (including builds badge)
......
...@@ -24,7 +24,7 @@ describe DeleteUserWorker do ...@@ -24,7 +24,7 @@ describe DeleteUserWorker do
context "solo owned groups present" do context "solo owned groups present" do
let(:solo_owned) { create(:group) } let(:solo_owned) { create(:group) }
let(:member) { create(:group_member) } let(:member) { create(:group_member) }
let(:user) { user = member.user } let(:user) { member.user }
before do before do
solo_owned.group_members = [member] solo_owned.group_members = [member]
...@@ -39,7 +39,7 @@ describe DeleteUserWorker do ...@@ -39,7 +39,7 @@ describe DeleteUserWorker do
context "deletions with force" do context "deletions with force" do
let(:solo_owned) { create(:group) } let(:solo_owned) { create(:group) }
let(:member) { create(:group_member) } let(:member) { create(:group_member) }
let(:user) { user = member.user } let(:user) { member.user }
before do before do
solo_owned.group_members = [member] solo_owned.group_members = [member]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment