Skip to content

G
gitlab-ce
Commit 313f7903 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve conflict in app/assets/javascripts/filtered_search/dropdown_user.js 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 1b3de2f5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/filtered_search/dropdown_user.js
View file @ 313f7903
...@@ -15,11 +15,8 @@ class DropdownUser extends gl.FilteredSearchDropdown { ...@@ -15,11 +15,8 @@ class DropdownUser extends gl.FilteredSearchDropdown {
params: { params: {
per_page: 20, per_page: 20,
active: true, active: true,
<<<<<<< HEAD
=======
group_id: this.getGroupId(), group_id: this.getGroupId(),
project_id: this.getProjectId(), project_id: this.getProjectId(),
>>>>>>> ce-com/master
current_user: true, current_user: true,
...this.projectOrGroupId(), ...this.projectOrGroupId(),
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7