diff options
| author | Phil Hughes <me@iamphill.com> | 2016-06-09 15:58:02 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-06-10 10:45:44 +0100 |
| commit | b2b3fb6c0130af4d8b08ed2a92d76c269fb226eb (patch) | |
| tree | d6c7a3645682ba114b2eb75ed015c04c8f2e7891 | |
| parent | e0f3e44b3e67b80543b6956c7ae46035fabc696f (diff) | |
| download | gitlab-ce-b2b3fb6c0130af4d8b08ed2a92d76c269fb226eb.tar.gz | |
Revert change to search all users
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index de0eae58bff..88246b0feb8 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -95,7 +95,7 @@ class @UsersSelect data: (term, callback) => isAuthorFilter = $('.js-author-search') - @users term, term is '' and isAuthorFilter, (users) => + @users term, (users) => if term.length is 0 showDivider = 0 @@ -221,7 +221,7 @@ class @UsersSelect multiple: $(select).hasClass('multiselect') minimumInputLength: 0 query: (query) => - @users query.term, @projectId?, (users) => + @users query.term, (users) => data = { results: users } if query.term.length == 0 @@ -304,7 +304,7 @@ class @UsersSelect # Return users list. Filtered by query # Only active users retrieved - users: (query, fromProject, callback) => + users: (query, callback) => url = @buildUrl(@usersPath) $.ajax( @@ -313,7 +313,7 @@ class @UsersSelect search: query per_page: 20 active: true - project_id: @projectId if fromProject + project_id: @projectId group_id: @groupId current_user: @showCurrentUser author_id: @authorId |