Skip to content

G
gitlab-ce
Commit bd69d4f1 authored by Filipa Lacerda's avatar Filipa Lacerda
Browse files
Options

Resolve conflicts for app/assets/javascripts/api.js

parent c8c88bcd
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/api.js
View file @ bd69d4f1
...@@ -274,7 +274,6 @@ const Api = { ...@@ -274,7 +274,6 @@ const Api = {
return axios.get(url, { params }); return axios.get(url, { params });
}, },
<<<<<<< HEAD
approverUsers(search, options, callback = $.noop) { approverUsers(search, options, callback = $.noop) {
const url = Api.buildUrl('/autocomplete/users.json'); const url = Api.buildUrl('/autocomplete/users.json');
return axios return axios
...@@ -311,8 +310,6 @@ const Api = { ...@@ -311,8 +310,6 @@ const Api = {
}); });
}, },
=======
>>>>>>> upstream/master
buildUrl(url) { buildUrl(url) {
let urlRoot = ''; let urlRoot = '';
if (gon.relative_url_root != null) { if (gon.relative_url_root != null) {
......
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