Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a27363e2
Commit
a27363e2
authored
May 26, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed approvers user endpoint
parent
558e92b3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
app/assets/javascripts/api.js
app/assets/javascripts/api.js
+13
-1
app/assets/javascripts/approvers_select.js
app/assets/javascripts/approvers_select.js
+1
-1
No files found.
app/assets/javascripts/api.js
View file @
a27363e2
...
...
@@ -25,7 +25,7 @@ const Api = {
},
// Return groups list. Filtered by query
groups
(
query
,
options
,
callback
)
{
groups
(
query
,
options
,
callback
=
$
.
noop
)
{
const
url
=
Api
.
buildUrl
(
Api
.
groupsPath
);
return
$
.
ajax
({
url
,
...
...
@@ -149,6 +149,18 @@ const Api = {
});
},
approverUsers
(
search
,
options
,
callback
=
$
.
noop
)
{
const
url
=
Api
.
buildUrl
(
'
/autocomplete/users.json
'
);
return
$
.
ajax
({
url
,
data
:
$
.
extend
({
search
,
per_page
:
20
,
},
options
),
dataType
:
'
json
'
,
}).
done
(
callback
);
},
ldap_groups
(
query
,
provider
,
callback
)
{
const
url
=
Api
.
buildUrl
(
this
.
ldapGroupsPath
).
replace
(
'
:provider
'
,
provider
);
return
Api
.
wrapAjaxCall
({
...
...
app/assets/javascripts/approvers_select.js
View file @
a27363e2
...
...
@@ -46,7 +46,7 @@ export default class ApproversSelect {
skip_users
:
ApproversSelect
.
getApprovers
(
this
.
fieldNames
[
0
],
'
.js-approver
'
),
project_id
:
$
(
'
#project_id
'
).
val
(),
};
return
Api
.
u
sers
(
term
,
options
);
return
Api
.
approverU
sers
(
term
,
options
);
}
handleSelectChange
(
e
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment