diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/projects/commits | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/projects/commits')
-rw-r--r-- | app/assets/javascripts/projects/commits/components/author_select.vue | 4 | ||||
-rw-r--r-- | app/assets/javascripts/projects/commits/store/actions.js | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/app/assets/javascripts/projects/commits/components/author_select.vue b/app/assets/javascripts/projects/commits/components/author_select.vue index eb514b5c070..a8589b50899 100644 --- a/app/assets/javascripts/projects/commits/components/author_select.vue +++ b/app/assets/javascripts/projects/commits/components/author_select.vue @@ -110,8 +110,8 @@ export default { <gl-new-dropdown :text="dropdownText" :disabled="hasSearchParam" - toggle-class="gl-py-3" - class="gl-dropdown w-100 mt-2 mt-sm-0" + toggle-class="gl-py-3 gl-border-0" + class="w-100 mt-2 mt-sm-0" > <gl-new-dropdown-header> {{ __('Search by author') }} diff --git a/app/assets/javascripts/projects/commits/store/actions.js b/app/assets/javascripts/projects/commits/store/actions.js index a3a53c2f975..0a52a92ae9d 100644 --- a/app/assets/javascripts/projects/commits/store/actions.js +++ b/app/assets/javascripts/projects/commits/store/actions.js @@ -3,6 +3,7 @@ import * as types from './mutation_types'; import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; import { __ } from '~/locale'; +import { joinPaths } from '~/lib/utils/url_utility'; export default { setInitialData({ commit }, data) { @@ -16,10 +17,8 @@ export default { }, fetchAuthors({ dispatch, state }, author = null) { const { projectId } = state; - const path = '/autocomplete/users.json'; - return axios - .get(path, { + .get(joinPaths(gon.relative_url_root || '', '/autocomplete/users.json'), { params: { project_id: projectId, active: true, |