diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-21 22:25:59 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-21 22:25:59 +0000 |
commit | 0daa21ed8cf3fe917645b66baa27917923bfdd8f (patch) | |
tree | 4003a69c07d0f507dc13070a20fc0048d7b9c30d /spec/controllers | |
parent | 1cfc4af31e01c59066e5194a080f49ac6cacc0a3 (diff) | |
parent | 577df6b8ca4532545ac2cad11a693dc976160b36 (diff) | |
download | gitlab-ce-0daa21ed8cf3fe917645b66baa27917923bfdd8f.tar.gz |
Merge branch 'fix-email-autocomplete' into 'master'
Fix bug preventing invite by e-mail
This was broken in 70f5291808 as a result of introducing the ability to filter by current user.
Closes #2320
See merge request !1181
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/autocomplete_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb index 3521d690259..aa8d6cb807f 100644 --- a/spec/controllers/autocomplete_controller_spec.rb +++ b/spec/controllers/autocomplete_controller_spec.rb @@ -74,7 +74,7 @@ describe AutocompleteController do describe 'GET #users with project ID' do before do - get(:users, project_id: project.id) + get(:users, project_id: project.id, current_user: true) end it { expect(body).to be_kind_of(Array) } |