diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-15 15:43:26 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-15 15:43:26 +0000 |
| commit | bb59a1f98eb44cbe288d876eb963e9467b8637f4 (patch) | |
| tree | 0c0ad27bc8781a853ced8382265efd19669f6930 /app/assets/javascripts | |
| parent | 8b7bf2a0e0fb4ec5765f0b1da74a121a82659113 (diff) | |
| parent | 33f8b06c3925fbefd6eac38efc71eac8b787ebd7 (diff) | |
| download | gitlab-ce-bb59a1f98eb44cbe288d876eb963e9467b8637f4.tar.gz | |
Merge branch 'assign-to-issuable-opener' into 'master'
Issuable can be assigned to author
Closes #9014
The only difference with #9014 is that I thoughed the author should also be
able to assign the issue. If this is unwanted behavior Ill revert it.
/cc @DouweM
See merge request !2765
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/users_select.js.coffee | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/assets/javascripts/users_select.js.coffee b/app/assets/javascripts/users_select.js.coffee index eee9b6e690e..a7e934936e9 100644 --- a/app/assets/javascripts/users_select.js.coffee +++ b/app/assets/javascripts/users_select.js.coffee @@ -12,6 +12,7 @@ class @UsersSelect showNullUser = $dropdown.data('null-user') showAnyUser = $dropdown.data('any-user') firstUser = $dropdown.data('first-user') + @authorId = $dropdown.data('author-id') selectedId = $dropdown.data('selected') defaultLabel = $dropdown.data('default-label') issueURL = $dropdown.data('issueUpdate') @@ -207,6 +208,7 @@ class @UsersSelect @projectId = $(select).data('project-id') @groupId = $(select).data('group-id') @showCurrentUser = $(select).data('current-user') + @authorId = $(select).data('author-id') showNullUser = $(select).data('null-user') showAnyUser = $(select).data('any-user') showEmailUser = $(select).data('email-user') @@ -312,6 +314,7 @@ class @UsersSelect project_id: @projectId group_id: @groupId current_user: @showCurrentUser + author_id: @authorId dataType: "json" ).done (users) -> callback(users) |