Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 09:08:02 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-05-13 09:08:02 +0300
commit2c1525618498a2aab2eed6a36f5045ce3f93ac6f (patch)
treea34cf3963e76388348cb4533d6fa8de4e1ce73c4 /app/assets/javascripts/vue_shared/mixins
parent2fc7740f3ca1ca5e5a88f9f4136d631f7650bac7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_shared/mixins')
-rw-r--r--app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js11
1 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js b/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
index 69e9839380f..c93b3d37a63 100644
--- a/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
+++ b/app/assets/javascripts/vue_shared/mixins/ci_pagination_api_mixin.js
@@ -35,13 +35,18 @@ export default {
},
onChangeWithFilter(params) {
- const { username } = this.requestData;
+ const { username, ref } = this.requestData;
+ const paramsData = params;
if (username) {
- return { ...params, username };
+ paramsData.username = username;
}
- return params;
+ if (ref) {
+ paramsData.ref = ref;
+ }
+
+ return paramsData;
},
updateInternalState(parameters) {