diff options
author | Rémy Coutable <remy@rymai.me> | 2016-10-31 18:37:13 +0100 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-10-31 18:47:30 +0100 |
commit | e5c6f943fe6e33510813f05a6f7e6d56af47461a (patch) | |
tree | d93062daf78ef0179cf96c071cdb999e0ccca74e /app/assets/javascripts/api.js | |
parent | a60cc42b262cb63ce5d2284f1f3f41d6521daa14 (diff) | |
download | gitlab-ce-e5c6f943fe6e33510813f05a6f7e6d56af47461a.tar.gz |
Backport Group API code that was added in EE onlybackport-ee-js-groups-api
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/assets/javascripts/api.js')
-rw-r--r-- | app/assets/javascripts/api.js | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/assets/javascripts/api.js b/app/assets/javascripts/api.js index 7ebe1599fca..1cab66e109e 100644 --- a/app/assets/javascripts/api.js +++ b/app/assets/javascripts/api.js @@ -22,16 +22,14 @@ }); }, // Return groups list. Filtered by query - // Only active groups retrieved - groups: function(query, skip_ldap, skip_groups, callback) { + groups: function(query, options, callback) { var url = Api.buildUrl(Api.groupsPath); return $.ajax({ url: url, - data: { - search: query, - skip_groups: skip_groups, - per_page: 20 - }, + data: $.extend({ + search: query, + per_page: 20 + }, options), dataType: "json" }).done(function(groups) { return callback(groups); |