diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-07 12:40:21 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 21:09:25 +0100 |
| commit | 4231cfeba5f6de519a8609b8aa8a6880e38c2414 (patch) | |
| tree | 2fcd8a1809192c6f70861f9e753d70182d90b54a | |
| parent | d249da1c16bea8f9d340520168c64794c5f78928 (diff) | |
| download | gitlab-ce-4231cfeba5f6de519a8609b8aa8a6880e38c2414.tar.gz | |
Target right release, rebase got it wrong
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | spec/workers/delete_user_worker_spec.rb | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index bdeb9b68bde..ee9d3cebf49 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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) diff --git a/spec/workers/delete_user_worker_spec.rb b/spec/workers/delete_user_worker_spec.rb index bec9aecb48c..a98ce6e5999 100644 --- a/spec/workers/delete_user_worker_spec.rb +++ b/spec/workers/delete_user_worker_spec.rb @@ -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] |