diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-02-02 16:14:29 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-02-02 16:14:29 +0000 |
commit | 8e97e1fc76eb9fd85083f7f1d2684bb5a6de2425 (patch) | |
tree | 7f488ab70dcb57d379cf1a4ec86134b3f74cbd6c | |
parent | a7f1463ed99bb5017854faf31928d2ce0350e202 (diff) | |
parent | 0acbc1b734201a755c9b566f29bca96a967b1ec4 (diff) | |
download | gitlab-ce-8e97e1fc76eb9fd85083f7f1d2684bb5a6de2425.tar.gz |
Merge branch 'axios-project' into 'master'
Replace $.ajax in project.js
See merge request gitlab-org/gitlab-ce!16873
-rw-r--r-- | app/assets/javascripts/pages/projects/project.js | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/assets/javascripts/pages/projects/project.js b/app/assets/javascripts/pages/projects/project.js index e30d558726b..863dac0d20e 100644 --- a/app/assets/javascripts/pages/projects/project.js +++ b/app/assets/javascripts/pages/projects/project.js @@ -1,7 +1,10 @@ /* eslint-disable func-names, space-before-function-paren, no-var, consistent-return, no-new, prefer-arrow-callback, no-return-assign, one-var, one-var-declaration-per-line, object-shorthand, no-else-return, newline-per-chained-call, no-shadow, vars-on-top, prefer-template, max-len */ import Cookies from 'js-cookie'; -import { visitUrl } from '../../lib/utils/url_utility'; +import { __ } from '~/locale'; +import { visitUrl } from '~/lib/utils/url_utility'; +import axios from '~/lib/utils/axios_utils'; +import flash from '~/flash'; import projectSelect from '../../project_select'; export default class Project { @@ -67,17 +70,15 @@ export default class Project { $dropdown = $(this); selected = $dropdown.data('selected'); return $dropdown.glDropdown({ - data: function(term, callback) { - return $.ajax({ - url: $dropdown.data('refs-url'), - data: { + data(term, callback) { + axios.get($dropdown.data('refs-url'), { + params: { ref: $dropdown.data('ref'), search: term, }, - dataType: 'json', - }).done(function(refs) { - return callback(refs); - }); + }) + .then(({ data }) => callback(data)) + .catch(() => flash(__('An error occurred while getting projects'))); }, selectable: true, filterable: true, |